dir->fsend(Job_end, jcr->Job, jcr->JobStatus, jcr->JobFiles,
edit_uint64(jcr->JobBytes, ec1), jcr->JobErrors);
dir->signal(BNET_EOD); /* send EOD to Director daemon */
+ /* ***FIXME*** remove for production */
+ sm_check(__FILE__, __LINE__, true);
return;
}
if (strncmp(fd_cmds[i].cmd, fd->msg, strlen(fd_cmds[i].cmd)) == 0) {
found = true; /* indicate command found */
jcr->errmsg[0] = 0;
- if (!fd_cmds[i].func(jcr) || job_canceled(jcr)) { /* do command */
+ if (!fd_cmds[i].func(jcr)) { /* do command */
/* Note fd->msg command may be destroyed by comm activity */
- if (jcr->errmsg[0]) {
- Jmsg1(jcr, M_FATAL, 0, _("Command error with FD, hanging up. %s\n"),
- jcr->errmsg);
- } else {
- Jmsg0(jcr, M_FATAL, 0, _("Command error with FD, hanging up.\n"));
+ if (!job_canceled(jcr)) {
+ if (jcr->errmsg[0]) {
+ Jmsg1(jcr, M_FATAL, 0, _("Command error with FD, hanging up. %s\n"),
+ jcr->errmsg);
+ } else {
+ Jmsg0(jcr, M_FATAL, 0, _("Command error with FD, hanging up.\n"));
+ }
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
}
- set_jcr_job_status(jcr, JS_ErrorTerminated);
quit = true;
}
break;
}
}
if (!found) { /* command not found */
- Jmsg1(jcr, M_FATAL, 0, _("FD command not found: %s\n"), fd->msg);
- Dmsg1(110, "<filed: Command not found: %s\n", fd->msg);
+ if (!job_canceled(jcr)) {
+ Jmsg1(jcr, M_FATAL, 0, _("FD command not found: %s\n"), fd->msg);
+ Dmsg1(110, "<filed: Command not found: %s\n", fd->msg);
+ }
fd->fsend(ferrmsg);
break;
}