From 6689d2b4431f13bcde12d41bb790bb9a26a58f21 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 11 Nov 2004 07:55:06 +0000
Subject: [PATCH] Add working_directory to be /tmp for wx_console. - Allow both
 a JobId and a filename or list of files to be   specified on a restore
 command line.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1682 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/cats/sql_update.c             | 4 ++--
 bacula/src/dird/admin.c                  | 9 ---------
 bacula/src/dird/backup.c                 | 2 +-
 bacula/src/dird/job.c                    | 4 ++++
 bacula/src/dird/mac.c                    | 2 +-
 bacula/src/dird/restore.c                | 2 +-
 bacula/src/wx-console/console_thread.cpp | 1 +
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index f47bf6acbc..14f9c93bd2 100644
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -84,8 +84,8 @@ int db_mark_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId)
 /*
  * Update the Job record at start of Job
  *
- *  Returns: 0 on failure
- *	     1 on success
+ *  Returns: false on failure
+ *	     true  on success
  */
 bool
 db_update_job_start_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
diff --git a/bacula/src/dird/admin.c b/bacula/src/dird/admin.c
index 746f629b4f..db42e9af68 100644
--- a/bacula/src/dird/admin.c
+++ b/bacula/src/dird/admin.c
@@ -48,11 +48,6 @@ int do_admin(JCR *jcr)
 {
 
    jcr->jr.JobId = jcr->JobId;
-   jcr->jr.StartTime = jcr->start_time;
-   if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
-      Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
-      goto bail_out;
-   }
 
    jcr->fname = (char *)get_pool_memory(PM_FNAME);
 
@@ -63,10 +58,6 @@ int do_admin(JCR *jcr)
    set_jcr_job_status(jcr, JS_Running);
    admin_cleanup(jcr, JS_Terminated);
    return 0;
-    
-bail_out:
-   admin_cleanup(jcr, JS_ErrorTerminated);
-   return 0;
 }
 
 /*
diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index bba769df66..71cd29a1dc 100644
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -127,7 +127,7 @@ int do_backup(JCR *jcr)
    set_jcr_job_status(jcr, JS_Running);
    Dmsg2(100, "JobId=%d JobLevel=%c\n", jcr->jr.JobId, jcr->jr.JobLevel);
    if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
-      Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
+      Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
       goto bail_out;
    }
 
diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 72b168adb2..7be9224212 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -173,7 +173,11 @@ static void *job_thread(void *arg)
    for ( ;; ) {
       Dmsg0(200, "=====Start Job=========\n");
       jcr->start_time = time(NULL);	 /* set the real start time */
+      jcr->jr.StartTime = jcr->start_time;
       set_jcr_job_status(jcr, JS_Running);
+      if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
+         Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
+      }
 
       if (job_canceled(jcr)) {
 	 update_job_end_record(jcr);
diff --git a/bacula/src/dird/mac.c b/bacula/src/dird/mac.c
index ee60359c51..d8dec58e3b 100644
--- a/bacula/src/dird/mac.c
+++ b/bacula/src/dird/mac.c
@@ -146,7 +146,7 @@ bool do_mac(JCR *jcr)
    set_jcr_job_status(jcr, JS_Running);
    Dmsg2(100, "JobId=%d JobLevel=%c\n", jcr->jr.JobId, jcr->jr.JobLevel);
    if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
-      Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
+      Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
       goto bail_out;
    }
 
diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c
index fa541d84cd..05006a24b1 100644
--- a/bacula/src/dird/restore.c
+++ b/bacula/src/dird/restore.c
@@ -75,7 +75,7 @@ int do_restore(JCR *jcr)
    memset(&rjr, 0, sizeof(rjr));
    jcr->jr.JobLevel = L_FULL;	      /* Full restore */
    if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
-      Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
+      Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
       restore_cleanup(jcr, JS_ErrorTerminated);
       return 0;
    }
diff --git a/bacula/src/wx-console/console_thread.cpp b/bacula/src/wx-console/console_thread.cpp
index 705033f053..2038ed3412 100644
--- a/bacula/src/wx-console/console_thread.cpp
+++ b/bacula/src/wx-console/console_thread.cpp
@@ -62,6 +62,7 @@ void console_thread::InitLib() {
    init_stack_dump();
    my_name_is(0, NULL, "wx-console");
    //textdomain("bacula-console");
+   working_directory = "/tmp";
    
    inited = true;
 }
-- 
2.39.2