}
return 1;
} else {
- store = get_storage_resource(ua, cmd);
+ store = get_storage_resource(ua, 0);
if (store) {
do_storage_status(ua, store);
}
client = NULL;
for (i=0; (client = (CLIENT *)GetNextRes(R_CLIENT, (RES *)client)); i++)
{ }
- unique_client = (CLIENT **) malloc(i * sizeof(CLIENT));
+ unique_client = (CLIENT **)malloc(i * sizeof(CLIENT));
/* Find Unique Client address/port */
client = (CLIENT *)GetNextRes(R_CLIENT, NULL);
i = 0;
case JS_ErrorTerminated:
msg = _("has erred");
break;
- case JS_Cancelled:
+ case JS_Canceled:
msg = _("has been canceled");
break;
case JS_WaitFD:
Mmsg(&msg, _("is waiting on Storage %s"), jcr->store->hdr.name);
pool_mem = TRUE;
break;
+ case JS_WaitStoreRes:
+ msg = _("is waiting on max Storage jobs");
+ break;
+ case JS_WaitClientRes:
+ msg = _("is waiting on max Client jobs");
+ break;
+ case JS_WaitJobRes:
+ msg = _("is waiting on max Job jobs");
+ break;
+ case JS_WaitMaxJobs:
+ msg = _("is waiting on max total jobs");
+ break;
+ case JS_WaitStartTime:
+ msg = _("is waiting for its start time");
+ break;
+
+
default:
msg = (char *) get_pool_memory(PM_FNAME);
Mmsg(&msg, _("is in unknown state %c"), jcr->JobStatus);
if (!connect_to_storage_daemon(ua->jcr, 1, 15, 0)) {
bsendmsg(ua, _("\nFailed to connect to Storage daemon %s.\n====\n"),
store->hdr.name);
+ if (ua->jcr->store_bsock) {
+ bnet_close(ua->jcr->store_bsock);
+ ua->jcr->store_bsock = NULL;
+ }
return;
}
Dmsg0(20, _("Connected to storage daemon\n"));
if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) {
bsendmsg(ua, _("Failed to connect to Client %s.\n====\n"),
client->hdr.name);
+ if (ua->jcr->file_bsock) {
+ bnet_close(ua->jcr->file_bsock);
+ ua->jcr->file_bsock = NULL;
+ }
return;
}
Dmsg0(20, _("Connected to file daemon\n"));