*
*/
/*
- Copyright (C) 2003-2005 Kern Sibbald
+ Copyright (C) 2003-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
char b1[30], b2[30], b3[30];
int bpb;
- bnet_fsend(user, "\n%s Version: " VERSION " (" BDATE ") %s %s %s\n", my_name,
- HOST_OS, DISTNAME, DISTVER);
+ bnet_fsend(user, _("\n%s Version: %s (%s) %s %s %s\n"), my_name,
+ VERSION, BDATE, HOST_OS, DISTNAME, DISTVER);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
- bnet_fsend(user, _("Daemon started %s, %d Job%s run since started.\n"), dt, num_jobs_run,
- num_jobs_run == 1 ? "" : "s");
+ if (num_jobs_run == 1) {
+ bnet_fsend(user, _("Daemon started %s, 1 Job run since started.\n"), dt);
+ }
+ else {
+ bnet_fsend(user, _("Daemon started %s, %d Jobs run since started.\n"), dt, num_jobs_run);
+ }
if (debug_level > 0) {
char b1[35], b2[35], b3[35], b4[35];
bnet_fsend(user, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
dev = device->dev;
if (dev && dev->is_open()) {
if (dev->is_labeled()) {
- bnet_fsend(user, _("Device %s is mounted with Volume \"%s\"\n"),
- dev->print_name(), dev->VolHdr.VolumeName);
+ bnet_fsend(user, _("Device %s is mounted with Volume=\"%s\" Pool=\"%s\"\n"),
+ dev->print_name(), dev->VolHdr.VolumeName,
+ dev->pool_name[0]?dev->pool_name:"*unknown*");
} else {
bnet_fsend(user, _("Device %s open but no Bacula volume is mounted.\n"),
dev->print_name());
edit_uint64_with_commas(dev->block_num, b2));
} else {
- bnet_fsend(user, _("Archive \"%s\" is not open or does not exist.\n"), device->hdr.name);
+ if (dev) {
+ bnet_fsend(user, _("Device %s is not open or does not exist.\n"), dev->print_name());
+ } else {
+ bnet_fsend(user, _("Device \"%s\" is not open or does not exist.\n"), device->hdr.name);
+ }
send_blocked_status(jcr, dev);
}
}
- bnet_fsend(user, "====\n\n");
- bnet_fsend(user, "Volume status:\n");
+ bnet_fsend(user, _("====\n\n"));
+ bnet_fsend(user, _("In Use Volume status:\n"));
list_volumes(user);
+ bnet_fsend(user, _("====\n\n"));
-
#ifdef xxx
- if (debug_level > 0) {
- bnet_fsend(user, "====\n\n");
+ if (debug_level > 10) {
+ bnet_fsend(user, _("====\n\n"));
dump_resource(R_DEVICE, resources[R_DEVICE-r_first].res_head, sendit, user);
+ bnet_fsend(user, _("====\n\n"));
}
- bnet_fsend(user, "====\n\n");
#endif
list_spool_stats(user);
DCR *dcr = jcr->dcr;
if (!dev) {
- bnet_fsend(user, "No DEVICE structure.\n\n");
+ bnet_fsend(user, _("No DEVICE structure.\n\n"));
return;
}
switch (dev->dev_blocked) {
default:
break;
}
+ /* Send autochanger slot status */
+ if (dev->is_autochanger()) {
+ if (dev->Slot) {
+ bnet_fsend(user, _(" Slot %d is loaded in drive %d.\n"),
+ dev->Slot, dev->drive_index);
+ } else {
+ bnet_fsend(user, _(" Drive %d is not loaded.\n"), dev->drive_index);
+ }
+ }
if (debug_level > 1) {
bnet_fsend(user, _("Configured device capabilities:\n"));
bnet_fsend(user, "%sEOF ", dev->capabilities & CAP_EOF ? "" : "!");
bnet_fsend(user, "%sSHORT ", dev->state & ST_SHORT ? "" : "!");
bnet_fsend(user, "%sMOUNTED ", dev->state & ST_MOUNTED ? "" : "!");
bnet_fsend(user, "\n");
- bnet_fsend(user, "num_writers=%d JobStatus=%c block=%d\n\n", dev->num_writers,
+ bnet_fsend(user, _("num_writers=%d JobStatus=%c block=%d\n\n"), dev->num_writers,
jcr->JobStatus, dev->dev_blocked);
bnet_fsend(user, _("Device parameters:\n"));
- bnet_fsend(user, "Archive name: %s Device name: %s\n", dev->archive_name(),
+ bnet_fsend(user, _("Archive name: %s Device name: %s\n"), dev->archive_name(),
dev->name());
- bnet_fsend(user, "File=%u block=%u\n", dev->file, dev->block_num);
- bnet_fsend(user, "Min block=%u Max block=%u\n", dev->min_block_size, dev->max_block_size);
+ bnet_fsend(user, _("File=%u block=%u\n"), dev->file, dev->block_num);
+ bnet_fsend(user, _("Min block=%u Max block=%u\n"), dev->min_block_size, dev->max_block_size);
}
}
bool found = false;
int bps, sec;
JCR *jcr;
+ DCR *dcr, *rdcr;
char JobName[MAX_NAME_LENGTH];
char b1[30], b2[30], b3[30];
bnet_fsend(user, _("%s Job %s waiting for Client connection.\n"),
job_type_to_str(jcr->JobType), jcr->Job);
}
- if (jcr->dcr && jcr->dcr->device) {
+ dcr = jcr->dcr;
+ rdcr = jcr->read_dcr;
+ if ((dcr && dcr->device) || rdcr && rdcr->device) {
bstrncpy(JobName, jcr->Job, sizeof(JobName));
/* There are three periods after the Job name */
char *p;
*p = 0;
}
}
- bnet_fsend(user, _("%s %s job %s JobId=%d Volume=\"%s\" device=\"%s\"\n"),
+ if (rdcr && rdcr->device) {
+ bnet_fsend(user, _("Reading: %s %s job %s JobId=%d Volume=\"%s\"\n"
+ " pool=\"%s\" device=\"%s\"\n"),
job_level_to_str(jcr->JobLevel),
job_type_to_str(jcr->JobType),
JobName,
jcr->JobId,
- jcr->dcr->VolumeName,
- jcr->dcr->device->device_name);
+ rdcr->VolumeName,
+ rdcr->pool_name,
+ rdcr->dev?rdcr->dev->print_name():
+ rdcr->device->device_name);
+ }
+ if (dcr && dcr->device) {
+ bnet_fsend(user, _("Writing: %s %s job %s JobId=%d Volume=\"%s\"\n"
+ " pool=\"%s\" device=\"%s\"\n"),
+ job_level_to_str(jcr->JobLevel),
+ job_type_to_str(jcr->JobType),
+ JobName,
+ jcr->JobId,
+ dcr->VolumeName,
+ dcr->pool_name,
+ dcr->dev?dcr->dev->print_name():
+ dcr->device->device_name);
+ }
sec = time(NULL) - jcr->run_time;
if (sec <= 0) {
sec = 1;
found = true;
#ifdef DEBUG
if (jcr->file_bsock) {
- bnet_fsend(user, " FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n",
+ bnet_fsend(user, _(" FDReadSeqNo=%s in_msg=%u out_msg=%d fd=%d\n"),
edit_uint64_with_commas(jcr->file_bsock->read_seqno, b1),
jcr->file_bsock->in_msg_no, jcr->file_bsock->out_msg_no,
jcr->file_bsock->fd);
} else {
- bnet_fsend(user, " FDSocket closed\n");
+ bnet_fsend(user, _(" FDSocket closed\n"));
}
#endif
}
- free_jcr(jcr);
}
+ endeach_jcr(jcr);
+
if (!found) {
bnet_fsend(user, _("No Jobs running.\n"));
}
- bnet_fsend(user, "====\n");
+ bnet_fsend(user, _("====\n"));
}
static void list_terminated_jobs(void *arg)
}
switch (je->JobStatus) {
case JS_Created:
- termstat = "Created";
+ termstat = _("Created");
break;
case JS_FatalError:
case JS_ErrorTerminated:
- termstat = "Error";
+ termstat = _("Error");
break;
case JS_Differences:
- termstat = "Diffs";
+ termstat = _("Diffs");
break;
case JS_Canceled:
- termstat = "Cancel";
+ termstat = _("Cancel");
break;
case JS_Terminated:
- termstat = "OK";
+ termstat = _("OK");
break;
default:
- termstat = "Other";
+ termstat = _("Other");
break;
}
bstrncpy(JobName, je->Job, sizeof(JobName));
dt, JobName);
sendit(buf, strlen(buf), arg);
}
- sendit("====\n", 5, arg);
+ sendit(_("====\n"), 5, arg);
unlock_last_jobs_list();
}
if (sscanf(dir->msg, qstatus, time.c_str()) != 1) {
pm_strcpy(jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
- bnet_fsend(dir, "3900 Bad .status command, missing argument.\n");
+ bnet_fsend(dir, _("3900 Bad .status command, missing argument.\n"));
bnet_sig(dir, BNET_EOD);
return false;
}
if (njcr->JobId != 0) {
bnet_fsend(dir, DotStatusJob, njcr->JobId, njcr->JobStatus, njcr->JobErrors);
}
- free_jcr(njcr);
}
- }
- else if (strcmp(time.c_str(), "last") == 0) {
+ endeach_jcr(njcr);
+ } else if (strcmp(time.c_str(), "last") == 0) {
bnet_fsend(dir, OKqstatus, time.c_str());
if ((last_jobs) && (last_jobs->size() > 0)) {
job = (s_last_job*)last_jobs->last();
bnet_fsend(dir, DotStatusJob, job->JobId, job->JobStatus, job->Errors);
}
- }
- else {
+ } else {
pm_strcpy(jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
- bnet_fsend(dir, "3900 Bad .status command, wrong argument.\n");
+ bnet_fsend(dir, _("3900 Bad .status command, wrong argument.\n"));
bnet_sig(dir, BNET_EOD);
return false;
}
projects / bacula / bacula / blobdiff