/*
Bacula® - The Network Backup Solution
- Copyright (C) 2003-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2003-2009 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
/* Imported variables */
extern BSOCK *filed_chan;
-extern int r_first, r_last;
-extern struct s_res resources[];
extern void *start_heap;
/* Static variables */
static void sendit(const char *msg, int len, void *arg);
static void send_blocked_status(DEVICE *dev, STATUS_PKT *sp);
+static void send_device_status(DEVICE *dev, STATUS_PKT *sp);
static void list_terminated_jobs(STATUS_PKT *sp);
static void list_running_jobs(STATUS_PKT *sp);
static void list_jobs_waiting_on_reservation(STATUS_PKT *sp);
list_devices(sp);
- len = Mmsg(msg, _("In Use Volume status:\n"));
- sendit(msg, len, sp);
+ len = Mmsg(msg, _("Used Volume status:\n"));
+ if (!sp->api) sendit(msg, len, sp);
list_volumes(sendit, (void *)sp);
- sendit("====\n\n", 6, sp);
+ if (!sp->api) sendit("====\n\n", 6, sp);
#ifdef xxx
if (debug_level > 10) {
#endif
list_spool_stats(sendit, (void *)sp);
+ if (!sp->api) sendit("====\n\n", 6, sp);
}
int bpb;
len = Mmsg(msg, _("\nDevice status:\n"));
- sendit(msg, len, sp);
+ if (!sp->api) sendit(msg, len, sp);
foreach_res(changer, R_AUTOCHANGER) {
len = Mmsg(msg, _("Autochanger \"%s\" with devices:\n"),
}
}
}
- sendit("====\n\n", 6, sp);
+ if (!sp->api) sendit("====\n\n", 6, sp);
}
static void list_status_header(STATUS_PKT *sp)
}
/* Send autochanger slot status */
if (dev->is_autochanger()) {
- if (dev->Slot > 0) {
+ if (dev->get_slot() > 0) {
len = Mmsg(msg, _(" Slot %d is loaded in drive %d.\n"),
- dev->Slot, dev->drive_index);
+ dev->get_slot(), dev->drive_index);
sendit(msg, len, sp);
- } else if (dev->Slot == 0) {
+ } else if (dev->get_slot() == 0) {
len = Mmsg(msg, _(" Drive %d is not loaded.\n"), dev->drive_index);
sendit(msg, len, sp);
} else {
}
}
if (debug_level > 1) {
- len = Mmsg(msg, _("Configured device capabilities:\n"));
- sendit(msg, len, sp);
+ send_device_status(dev, sp);
+ }
+}
- len = Mmsg(msg, "%sEOF %sBSR %sBSF %sFSR %sFSF %sEOM %sREM %sRACCESS %sAUTOMOUNT %sLABEL %sANONVOLS %sALWAYSOPEN\n",
- dev->capabilities & CAP_EOF ? "" : "!",
- dev->capabilities & CAP_BSR ? "" : "!",
- dev->capabilities & CAP_BSF ? "" : "!",
- dev->capabilities & CAP_FSR ? "" : "!",
- dev->capabilities & CAP_FSF ? "" : "!",
- dev->capabilities & CAP_EOM ? "" : "!",
- dev->capabilities & CAP_REM ? "" : "!",
- dev->capabilities & CAP_RACCESS ? "" : "!",
- dev->capabilities & CAP_AUTOMOUNT ? "" : "!",
- dev->capabilities & CAP_LABEL ? "" : "!",
- dev->capabilities & CAP_ANONVOLS ? "" : "!",
- dev->capabilities & CAP_ALWAYSOPEN ? "" : "!");
- sendit(msg, len, sp);
+static void send_device_status(DEVICE *dev, STATUS_PKT *sp)
+{
+ POOL_MEM msg(PM_MESSAGE);
+ int len;
- len = Mmsg(msg, _("Device state:\n"));
- sendit(msg, len, sp);
+ len = Mmsg(msg, _("Configured device capabilities:\n"));
+ sendit(msg, len, sp);
- len = Mmsg(msg, "%sOPENED %sTAPE %sLABEL %sMALLOC %sAPPEND %sREAD %sEOT %sWEOT %sEOF %sNEXTVOL %sSHORT %sMOUNTED\n",
- dev->is_open() ? "" : "!",
- dev->is_tape() ? "" : "!",
- dev->is_labeled() ? "" : "!",
- dev->state & ST_MALLOC ? "" : "!",
- dev->can_append() ? "" : "!",
- dev->can_read() ? "" : "!",
- dev->at_eot() ? "" : "!",
- dev->state & ST_WEOT ? "" : "!",
- dev->at_eof() ? "" : "!",
- dev->state & ST_NEXTVOL ? "" : "!",
- dev->state & ST_SHORT ? "" : "!",
- dev->state & ST_MOUNTED ? "" : "!");
- sendit(msg, len, sp);
+ len = Mmsg(msg, "%sEOF %sBSR %sBSF %sFSR %sFSF %sEOM %sREM %sRACCESS %sAUTOMOUNT %sLABEL %sANONVOLS %sALWAYSOPEN\n",
+ dev->capabilities & CAP_EOF ? "" : "!",
+ dev->capabilities & CAP_BSR ? "" : "!",
+ dev->capabilities & CAP_BSF ? "" : "!",
+ dev->capabilities & CAP_FSR ? "" : "!",
+ dev->capabilities & CAP_FSF ? "" : "!",
+ dev->capabilities & CAP_EOM ? "" : "!",
+ dev->capabilities & CAP_REM ? "" : "!",
+ dev->capabilities & CAP_RACCESS ? "" : "!",
+ dev->capabilities & CAP_AUTOMOUNT ? "" : "!",
+ dev->capabilities & CAP_LABEL ? "" : "!",
+ dev->capabilities & CAP_ANONVOLS ? "" : "!",
+ dev->capabilities & CAP_ALWAYSOPEN ? "" : "!");
+ sendit(msg, len, sp);
- len = Mmsg(msg, _("num_writers=%d block=%d\n\n"), dev->num_writers, dev->blocked());
- sendit(msg, len, sp);
+ len = Mmsg(msg, _("Device state:\n"));
+ sendit(msg, len, sp);
- len = Mmsg(msg, _("Device parameters:\n"));
- sendit(msg, len, sp);
+ len = Mmsg(msg, "%sOPENED %sTAPE %sLABEL %sMALLOC %sAPPEND %sREAD %sEOT %sWEOT %sEOF %sNEXTVOL %sSHORT %sMOUNTED\n",
+ dev->is_open() ? "" : "!",
+ dev->is_tape() ? "" : "!",
+ dev->is_labeled() ? "" : "!",
+ dev->state & ST_MALLOC ? "" : "!",
+ dev->can_append() ? "" : "!",
+ dev->can_read() ? "" : "!",
+ dev->at_eot() ? "" : "!",
+ dev->state & ST_WEOT ? "" : "!",
+ dev->at_eof() ? "" : "!",
+ dev->state & ST_NEXTVOL ? "" : "!",
+ dev->state & ST_SHORT ? "" : "!",
+ dev->state & ST_MOUNTED ? "" : "!");
+ sendit(msg, len, sp);
- len = Mmsg(msg, _("Archive name: %s Device name: %s\n"), dev->archive_name(),
- dev->name());
- sendit(msg, len, sp);
+ len = Mmsg(msg, _("num_writers=%d reserved=%d block=%d\n\n"), dev->num_writers,
+ dev->num_reserved(), dev->blocked());
+ sendit(msg, len, sp);
- len = Mmsg(msg, _("File=%u block=%u\n"), dev->file, dev->block_num);
- sendit(msg, len, sp);
+ len = Mmsg(msg, _("Device parameters:\n"));
+ sendit(msg, len, sp);
- len = Mmsg(msg, _("Min block=%u Max block=%u\n"), dev->min_block_size, dev->max_block_size);
- sendit(msg, len, sp);
- }
+ len = Mmsg(msg, _("Archive name: %s Device name: %s\n"), dev->archive_name(),
+ dev->name());
+ sendit(msg, len, sp);
+
+ len = Mmsg(msg, _("File=%u block=%u\n"), dev->file, dev->block_num);
+ sendit(msg, len, sp);
+
+ len = Mmsg(msg, _("Min block=%u Max block=%u\n"), dev->min_block_size, dev->max_block_size);
+ sendit(msg, len, sp);
}
static void list_running_jobs(STATUS_PKT *sp)
POOL_MEM msg(PM_MESSAGE);
len = Mmsg(msg, _("\nRunning Jobs:\n"));
- sendit(msg, len, sp);
+ if (!sp->api) sendit(msg, len, sp);
foreach_jcr(jcr) {
if (jcr->JobStatus == JS_WaitFD) {
len = Mmsg(msg, _("%s Job %s waiting for Client connection.\n"),
- job_type_to_str(jcr->JobType), jcr->Job);
+ job_type_to_str(jcr->get_JobType()), jcr->Job);
sendit(msg, len, sp);
}
dcr = jcr->dcr;
rdcr = jcr->read_dcr;
- if ((dcr && dcr->device) || rdcr && rdcr->device) {
+ if ((dcr && dcr->device) || (rdcr && rdcr->device)) {
bstrncpy(JobName, jcr->Job, sizeof(JobName));
/* There are three periods after the Job name */
char *p;
if (rdcr && rdcr->device) {
len = Mmsg(msg, _("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),
+ job_level_to_str(jcr->get_JobLevel()),
+ job_type_to_str(jcr->get_JobType()),
JobName,
jcr->JobId,
rdcr->VolumeName,
if (dcr && dcr->device) {
len = Mmsg(msg, _("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),
+ job_level_to_str(jcr->get_JobLevel()),
+ job_type_to_str(jcr->get_JobType()),
JobName,
jcr->JobId,
dcr->VolumeName,
if (!found) {
len = Mmsg(msg, _("No Jobs running.\n"));
- sendit(msg, len, sp);
+ if (!sp->api) sendit(msg, len, sp);
}
- sendit("====\n", 5, sp);
+ if (!sp->api) sendit("====\n", 5, sp);
}
static void list_jobs_waiting_on_reservation(STATUS_PKT *sp)
int len;
len = Mmsg(msg, _("\nJobs waiting to reserve a drive:\n"));
- sendit(msg, len, sp);
+ if (!sp->api) sendit(msg, len, sp);
foreach_jcr(jcr) {
if (!jcr->reserve_msgs) {
}
endeach_jcr(jcr);
- sendit("====\n", 5, sp);
+ if (!sp->api) sendit("====\n", 5, sp);
}
const char *msg;
msg = _("\nTerminated Jobs:\n");
- sendit(msg, strlen(msg), sp);
+ if (!sp->api) sendit(msg, strlen(msg), sp);
if (last_jobs->size() == 0) {
- sendit("====\n", 5, sp);
+ if (!sp->api) sendit("====\n", 5, sp);
return;
}
lock_last_jobs_list();
msg = _(" JobId Level Files Bytes Status Finished Name \n");
- sendit(msg, strlen(msg), sp);
+ if (!sp->api) sendit(msg, strlen(msg), sp);
msg = _("===================================================================\n");
- sendit(msg, strlen(msg), sp);
+ if (!sp->api) sendit(msg, strlen(msg), sp);
foreach_dlist(je, last_jobs) {
char JobName[MAX_NAME_LENGTH];
const char *termstat;
case JS_Terminated:
termstat = _("OK");
break;
+ case JS_Warnings:
+ termstat = _("OK -- with warnings");
+ break;
default:
termstat = _("Other");
break;
*p = 0;
}
}
- bsnprintf(buf, sizeof(buf), _("%6d %-6s %8s %10s %-7s %-8s %s\n"),
- je->JobId,
- level,
- edit_uint64_with_commas(je->JobFiles, b1),
- edit_uint64_with_suffix(je->JobBytes, b2),
- termstat,
- dt, JobName);
+ if (sp->api) {
+ bsnprintf(buf, sizeof(buf), _("%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"),
+ je->JobId,
+ level,
+ edit_uint64_with_commas(je->JobFiles, b1),
+ edit_uint64_with_suffix(je->JobBytes, b2),
+ termstat,
+ dt, JobName);
+ } else {
+ bsnprintf(buf, sizeof(buf), _("%6d %-6s %8s %10s %-7s %-8s %s\n"),
+ je->JobId,
+ level,
+ edit_uint64_with_commas(je->JobFiles, b1),
+ edit_uint64_with_suffix(je->JobBytes, b2),
+ termstat,
+ dt, JobName);
+ }
sendit(buf, strlen(buf), sp);
}
unlock_last_jobs_list();
- sendit("====\n", 5, sp);
+ if (!sp->api) sendit("====\n", 5, sp);
}
/*
*/
bool status_cmd(JCR *jcr)
{
- BSOCK *bs = jcr->dir_bsock;
+ BSOCK *dir = jcr->dir_bsock;
STATUS_PKT sp;
- bs->fsend("\n");
- sp.bs = bs;
+ dir->fsend("\n");
+ sp.bs = dir;
output_status(&sp);
- bs->signal(BNET_EOD);
- return 1;
+ dir->signal(BNET_EOD);
+ return true;
}
/*
bool qstatus_cmd(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
- POOL_MEM time;
+ POOL_MEM cmd;
JCR *njcr;
s_last_job* job;
+ STATUS_PKT sp;
- if (sscanf(dir->msg, qstatus, time.c_str()) != 1) {
+ sp.bs = dir;
+ if (sscanf(dir->msg, qstatus, cmd.c_str()) != 1) {
pm_strcpy(jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
dir->fsend(_("3900 Bad .status command, missing argument.\n"));
dir->signal(BNET_EOD);
return false;
}
- unbash_spaces(time);
+ unbash_spaces(cmd);
+
+ Dmsg1(200, "cmd=%s\n", cmd.c_str());
- if (strcmp(time.c_str(), "current") == 0) {
- dir->fsend(OKqstatus, time.c_str());
+ if (strcmp(cmd.c_str(), "current") == 0) {
+ dir->fsend(OKqstatus, cmd.c_str());
foreach_jcr(njcr) {
if (njcr->JobId != 0) {
dir->fsend(DotStatusJob, njcr->JobId, njcr->JobStatus, njcr->JobErrors);
}
}
endeach_jcr(njcr);
- } else if (strcmp(time.c_str(), "last") == 0) {
- dir->fsend(OKqstatus, time.c_str());
+ } else if (strcmp(cmd.c_str(), "last") == 0) {
+ dir->fsend(OKqstatus, cmd.c_str());
if ((last_jobs) && (last_jobs->size() > 0)) {
job = (s_last_job*)last_jobs->last();
dir->fsend(DotStatusJob, job->JobId, job->JobStatus, job->Errors);
}
+ } else if (strcasecmp(cmd.c_str(), "header") == 0) {
+ sp.api = true;
+ list_status_header(&sp);
+ } else if (strcasecmp(cmd.c_str(), "running") == 0) {
+ sp.api = true;
+ list_running_jobs(&sp);
+ } else if (strcasecmp(cmd.c_str(), "waitreservation") == 0) {
+ sp.api = true;
+ list_jobs_waiting_on_reservation(&sp);
+ } else if (strcasecmp(cmd.c_str(), "devices") == 0) {
+ sp.api = true;
+ list_devices(&sp);
+ } else if (strcasecmp(cmd.c_str(), "volumes") == 0) {
+ sp.api = true;
+ list_volumes(sendit, &sp);
+ } else if (strcasecmp(cmd.c_str(), "spooling") == 0) {
+ sp.api = true;
+ list_spool_stats(sendit, &sp);
+ } else if (strcasecmp(cmd.c_str(), "terminated") == 0) {
+ sp.api = true;
+ list_terminated_jobs(&sp);
} else {
pm_strcpy(jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
projects / bacula / bacula / blobdiff