ebl fix RunScript bug (in some case, After script wasn't launched)

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

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 5d7ec87caf5d2ba16fbe0483a0ca83b8b45d87db..318290700868e2b826f59b0b6b21082542bc2a51 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -25,7 +25,7 @@
 #include "filed.h"
 
 #if defined(WIN32_VSS)
-#include "vss.h"   
+#include "vss.h"
 
 static pthread_mutex_t vss_mutex = PTHREAD_MUTEX_INITIALIZER;
 static int enable_vss;
@@ -230,6 +230,11 @@ void *handle_client_request(void *dirp)
       }
    }
 
+   if (!jcr->runscript_after) {
+      jcr->runscript_after=1;
+      run_scripts(jcr, jcr->RunScripts, "ClientAfterJob");
+   }
+
    /* Inform Storage daemon that we are done */
    if (jcr->store_bsock) {
       bnet_sig(jcr->store_bsock, BNET_TERMINATE);
@@ -1369,12 +1374,14 @@ 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, "ClientAfterJob");
+      jcr->runscript_after=1;
 
    } else {
       set_jcr_job_status(jcr, JS_Terminated);
 
       /* run shortly after end of data transmission */   
       run_scripts(jcr, jcr->RunScripts, "ClientAfterJob");
+      jcr->runscript_after=1;
 
       if (jcr->JobStatus != JS_Terminated) {
          bnet_suppress_error_messages(sd, 1);