Get FD Python running -- design Python backup interface.

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

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 87191888f82266feeec92b10fc51662b3e886d46..5569fb63582448c8e63e5fe7f5015dd45670f27c 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -93,6 +93,7 @@ JobId_t run_job(JCR *jcr)
    }
    jcr->term_wait_inited = true;
 
+
    /*
     * Open database
     */
@@ -111,6 +112,7 @@ JobId_t run_job(JCR *jcr)
    }
    Dmsg0(50, "DB opened\n");
 
+
    /*
     * Create Job record
     */
@@ -122,10 +124,11 @@ JobId_t run_job(JCR *jcr)
       goto bail_out;
    }
    JobId = jcr->JobId = jcr->jr.JobId;
-
    Dmsg4(100, "Created job record JobId=%d Name=%s Type=%c Level=%c\n",
        jcr->JobId, jcr->Job, jcr->jr.JobType, jcr->jr.JobLevel);
 
+   generate_daemon_event(jcr, "JobStart");
+
    if (!get_or_create_client_record(jcr)) {
       goto bail_out;
    }
@@ -187,13 +190,13 @@ JobId_t run_job(JCR *jcr)
    return JobId;
 
 bail_out:
+   generate_daemon_event(jcr, "JobEnd");
    if (jcr->fname) {
       free_memory(jcr->fname);
       jcr->fname = NULL;
    }
    V(jcr->mutex);
    return JobId;
-
 }
 
 
@@ -230,7 +233,6 @@ static void *job_thread(void *arg)
       } else {
 
          /* Run Job */
-         generate_event(jcr, "StartJob");
          if (jcr->job->RunBeforeJob) {
             POOLMEM *before = get_pool_memory(PM_FNAME);
             int status;
@@ -325,7 +327,6 @@ static void *job_thread(void *arg)
                }
             }
          }
-         generate_event(jcr, "EndJob");
          /* Send off any queued messages */
          if (jcr->msg_queue->size() > 0) {
             dequeue_messages(jcr);
@@ -334,7 +335,7 @@ static void *job_thread(void *arg)
 bail_out:
       break;
    }
-
+   generate_daemon_event(jcr, "JobEnd");
    Dmsg1(50, "======== End Job stat=%c ==========\n", jcr->JobStatus);
    sm_check(__FILE__, __LINE__, true);
    return NULL;
@@ -652,10 +653,12 @@ bool get_or_create_fileset_record(JCR *jcr, FILESET_DBR *fsr)
       }
    }
    jcr->jr.FileSetId = fsr->FileSetId;
+#ifdef needed
    if (fsr->created && jcr != NULL) {
       Jmsg(jcr, M_INFO, 0, _("Created new FileSet record \"%s\" %s\n"),
          fsr->FileSet, fsr->cCreateTime);
    }
+#endif
    Dmsg2(119, "Created FileSet %s record %u\n", jcr->fileset->hdr.name,
       jcr->jr.FileSetId);
    return true;