From 410d7bf312a6e1d343bd05f096c80938ab751db5 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sun, 18 Mar 2007 20:55:12 +0000 Subject: [PATCH] ebl display messages after run_script git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4360 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/job.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c index 0df9407104..91529724df 100644 --- a/bacula/src/dird/job.c +++ b/bacula/src/dird/job.c @@ -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"); -- 2.39.5