on_failure = false;
abort_on_error = true;
when = SCRIPT_Never;
+ old_proto = false; /* TODO: drop this with bacula 1.42 */
}
RUNSCRIPT *copy_runscript(RUNSCRIPT *src)
script->on_success,
script->on_failure,
jcr->JobStatus );
- script->when ^= SCRIPT_After; /* reset SCRIPT_After bit */
runit = true;
}
}
/* cancel running job properly */
if ( script->abort_on_error
&& (status == false)
- && (jcr->JobStatus == JS_Created)
+ && (jcr->JobStatus == JS_Created || jcr->JobStatus == JS_Running)
)
{
set_jcr_job_status(jcr, JS_ErrorTerminated);
free_pool_memory(ecmd);
if (bpipe == NULL) {
berrno be;
- Jmsg(jcr, M_FATAL, 0, _("%s could not execute. ERR=%s\n"), name,
+ Jmsg(jcr, M_ERROR, 0, _("Runscript: %s could not execute. ERR=%s\n"), name,
be.strerror());
return false;
}
status = close_bpipe(bpipe);
if (status != 0) {
berrno be;
- Jmsg(jcr, M_FATAL, 0, _("%s returned non-zero status=%d. ERR=%s\n"), name,
- status, be.strerror(status));
+ Jmsg(jcr, M_ERROR, 0, _("Runscript: %s returned non-zero status=%d. ERR=%s\n"), name,
+ be.code(status), be.strerror(status));
return false;
}
return true;