* List running jobs
*/
Dmsg0(1000, "Begin status jcr loop.\n");
+ len = Mmsg(&msg, _("Running Jobs:\n"));
+ sendit(msg, len, arg);
lock_jcr_chain();
foreach_jcr(njcr) {
bstrftime_nc(dt, sizeof(dt), njcr->start_time);
if (sec <= 0) {
sec = 1;
}
- bps = njcr->JobBytes / sec;
+ bps = (int)(njcr->JobBytes / sec);
len = Mmsg(&msg, _(" Files=%s Bytes=%s Bytes/sec=%s\n"),
edit_uint64_with_commas(njcr->JobFiles, b1),
edit_uint64_with_commas(njcr->JobBytes, b2),
unlock_jcr_chain();
Dmsg0(1000, "Begin status jcr loop.\n");
if (!found) {
- len = Mmsg(&msg, _("No jobs running.\n"));
+ len = Mmsg(&msg, _("No Jobs running.\n"));
sendit(msg, len, arg);
}
+ len = Mmsg(&msg, _("====\n"));
+ sendit(msg, len, arg);
free_pool_memory(msg);
}
*p = 0;
}
}
- bsnprintf(buf, sizeof(buf), _("%6d %-4s %8s %14s %-7s %-8s %s\n"),
+ bsnprintf(buf, sizeof(buf), _("%6d %-6s %8s %14s %-7s %-8s %s\n"),
je->JobId,
level,
edit_uint64_with_commas(je->JobFiles, b1),
dt, JobName);
sendit(buf, strlen(buf), arg);
}
- sendit("\n", 1, arg);
+ sendit("====\n", 5, arg);
unlock_last_jobs_list();
}
bnet_fsend(user, "\n");
do_status(bsock_sendit, (void *)user);
- bnet_fsend(user, "====\n");
bnet_sig(user, BNET_EOD);
return 1;
{
JCR *njcr;
char *termstat = _("Bacula Idle");
+ struct s_last_job *job;
bacstat = 0;
+ if (!last_jobs) {
+ return _("Bacula Terminated");
+ }
if (last_jobs->size() > 0) {
- switch (last_job.JobStatus) {
+ job = (struct s_last_job *)last_jobs->first();
+ switch (job->JobStatus) {
case JS_Canceled:
bacstat = -1;
termstat = _("Last Job Canceled");
}
Dmsg0(1000, "Begin bac_status jcr loop.\n");
lock_jcr_chain();
- for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
+ foreach_jcr(njcr) {
if (njcr->JobId != 0) {
bacstat = 1;
termstat = _("Bacula Running");