Fix reporting jobs from state file + misc

[bacula/bacula] / bacula / src / dird / dird.c

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 6fb1cd4e28b8d9bb609d2295ff3175a79d55bd51..b78e35d8667bf2a6d66fdc8a607a6edb8f7b628b 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -208,6 +208,7 @@ int main (int argc, char *argv[])
 
    /* Create pid must come after we are a daemon -- so we have our final pid */
    create_pid_file(director->pid_directory, "bacula-dir", director->DIRport);
+   read_state_file(director->working_directory, "bacula-dir", director->DIRport);
 
    drop(uid, gid);                   /* reduce priveleges if requested */
 
@@ -249,8 +250,8 @@ static void terminate_dird(int sig)
       exit(1);
    }
    already_here = TRUE;
-   delete_pid_file(director->pid_directory, "bacula-dir",  
-                  director->DIRport);
+   write_state_file(director->working_directory, "bacula-dir", director->DIRport);
+   delete_pid_file(director->pid_directory, "bacula-dir", director->DIRport);
 // signal(SIGCHLD, SIG_IGN);          /* don't worry about children now */
    term_scheduler();
    if (runjob) {