From db47ec2b6c1177591b6ee81329ccd97aab96ce44 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sun, 23 Jul 2006 18:38:10 +0000 Subject: [PATCH] o fix runscript bug on dird o exec runscript shortly after end of blast data (before despooling) git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3173 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/filed/job.c | 6 +++--- bacula/src/lib/runscript.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 3d3828e3b5..5513b7da32 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -233,9 +233,6 @@ void *handle_client_request(void *dirp) bnet_sig(jcr->store_bsock, BNET_TERMINATE); } - /* run after job */ - run_scripts(jcr, jcr->RunScripts, "ClientAfterJob"); - generate_daemon_event(jcr, "JobEnd"); dequeue_messages(jcr); /* send any queued messages */ @@ -1331,9 +1328,12 @@ static int backup_cmd(JCR *jcr) Dmsg0(110, "Error in blast_data.\n"); /* run shortly after end of data transmission */ run_scripts(jcr, jcr->RunScripts, "ClientAfterJobShort"); + } else { set_jcr_job_status(jcr, JS_Terminated); + /* run shortly after end of data transmission */ + run_scripts(jcr, jcr->RunScripts, "ClientAfterJobShort"); if (jcr->JobStatus != JS_Terminated) { bnet_suppress_error_messages(sd, 1); diff --git a/bacula/src/lib/runscript.c b/bacula/src/lib/runscript.c index c73cc1012c..4b851ed576 100644 --- a/bacula/src/lib/runscript.c +++ b/bacula/src/lib/runscript.c @@ -120,8 +120,7 @@ int run_scripts(JCR *jcr, alist *runscripts, const char *label) script->on_success, script->on_failure, jcr->JobStatus ); - script->when ^= SCRIPT_After; /* reset SCRIPT_After bit */ - runit = true; + runit = true; } } -- 2.39.5