]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/dird/job.c
ebl Add comments
[bacula/bacula] / bacula / src / dird / job.c
index 0df94071043f6719f5e6f250d5452a7b6be7d00f..373033a03aaec71f8764b87afa8909ac0ae9b38c 100644 (file)
@@ -122,7 +122,7 @@ bool setup_job(JCR *jcr)
    /*
     * Open database
     */
-   Dmsg0(50, "Open database\n");
+   Dmsg0(150, "Open database\n");
    jcr->db=db_init_database(jcr, jcr->catalog->db_name, jcr->catalog->db_user,
                             jcr->catalog->db_password, jcr->catalog->db_address,
                             jcr->catalog->db_port, jcr->catalog->db_socket,
@@ -135,7 +135,7 @@ bool setup_job(JCR *jcr)
       }
       goto bail_out;
    }
-   Dmsg0(50, "DB opened\n");
+   Dmsg0(150, "DB opened\n");
 
    if (!jcr->fname) {
       jcr->fname = get_pool_memory(PM_FNAME);
@@ -222,7 +222,6 @@ void update_job_end(JCR *jcr, int TermCode)
 {
    dequeue_messages(jcr);             /* display any queued messages */
    set_jcr_job_status(jcr, TermCode);
-   run_scripts(jcr, jcr->job->RunScripts, "AfterJob");
    update_job_end_record(jcr);
 }
 
@@ -327,11 +326,13 @@ static void *job_thread(void *arg)
          Pmsg1(0, _("Unimplemented job type: %d\n"), jcr->JobType);
          break;
       }
+   }
 
-      /* Send off any queued messages */
-      if (jcr->msg_queue && jcr->msg_queue->size() > 0) {
-         dequeue_messages(jcr);
-      }
+   run_scripts(jcr, jcr->job->RunScripts, "AfterJob");
+
+   /* Send off any queued messages */
+   if (jcr->msg_queue && jcr->msg_queue->size() > 0) {
+      dequeue_messages(jcr);
    }
 
    generate_daemon_event(jcr, "JobEnd");
@@ -536,7 +537,7 @@ DBId_t get_or_create_pool_record(JCR *jcr, char *pool_name)
 
    memset(&pr, 0, sizeof(pr));
    bstrncpy(pr.Name, pool_name, sizeof(pr.Name));
-   Dmsg1(010, "get_or_create_pool=%s\n", pool_name);
+   Dmsg1(110, "get_or_create_pool=%s\n", pool_name);
 
    while (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */
       /* Try to create the pool */
@@ -1068,7 +1069,7 @@ void copy_wstorage(JCR *jcr, alist *storage, const char *where)
       }
       jcr->wstorage = New(alist(10, not_owned_by_alist));
       foreach_alist(st, storage) {
-         Dmsg1(50, "storage=%s\n", st->name());
+         Dmsg1(100, "wstorage=%s\n", st->name());
          jcr->wstorage->append(st);
       }
       if (!jcr->wstore_source) {