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.
extern void *start_heap;
/* Forward referenced functions */
-static void list_terminated_jobs(STATUS_PKT *sp, bool api);
-static void list_running_jobs(STATUS_PKT *sp, bool api);
-static void list_status_header(STATUS_PKT *sp, bool api);
+static void list_terminated_jobs(STATUS_PKT *sp);
+static void list_running_jobs(STATUS_PKT *sp);
+static void list_status_header(STATUS_PKT *sp);
static void sendit(const char *msg, int len, STATUS_PKT *sp);
static const char *level_to_str(int level);
*/
void output_status(STATUS_PKT *sp)
{
- list_status_header(sp, false /*no api*/);
- list_running_jobs(sp, false /*no api*/);
- list_terminated_jobs(sp, false /*no api*/);
+ list_status_header(sp);
+ list_running_jobs(sp);
+ list_terminated_jobs(sp);
}
-static void list_status_header(STATUS_PKT *sp, bool api)
+static void list_status_header(STATUS_PKT *sp)
{
POOL_MEM msg(PM_MESSAGE);
char b1[32], b2[32], b3[32], b4[32], b5[35];
len = Mmsg(msg, _(" Sizeof: boffset_t=%d size_t=%d debug=%d trace=%d\n"),
sizeof(boffset_t), sizeof(size_t), debug_level, get_trace());
sendit(msg.c_str(), len, sp);
+ if (debug_level > 0 && plugin_list->size() > 0) {
+ Plugin *plugin;
+ int len;
+ pm_strcpy(msg, "Plugin: ");
+ foreach_alist(plugin, plugin_list) {
+ len = pm_strcat(msg, plugin->file);
+ if (len > 80) {
+ pm_strcat(msg, "\n ");
+ } else {
+ pm_strcat(msg, " ");
+ }
+ }
+ len = pm_strcat(msg, "\n");
+ sendit(msg.c_str(), len, sp);
+ }
}
-static void list_running_jobs(STATUS_PKT *sp, bool api)
+static void list_running_jobs(STATUS_PKT *sp)
{
int sec, bps;
POOL_MEM msg(PM_MESSAGE);
* List running jobs
*/
Dmsg0(1000, "Begin status jcr loop.\n");
- if (!api) {
+ if (!sp->api) {
len = Mmsg(msg, _("\nRunning Jobs:\n"));
sendit(msg.c_str(), len, sp);
}
njcr->JobId, njcr->Job);
sendit(msg.c_str(), len, sp);
len = Mmsg(msg, _(" %s%s Job started: %s\n"),
- vss, job_type_to_str(njcr->JobType), dt);
+ vss, job_type_to_str(njcr->get_JobType()), dt);
}
sendit(msg.c_str(), len, sp);
if (njcr->JobId == 0) {
}
endeach_jcr(njcr);
- if (!api) {
+ if (!sp->api) {
if (!found) {
len = Mmsg(msg, _("No Jobs running.\n"));
sendit(msg.c_str(), len, sp);
}
-static void list_terminated_jobs(STATUS_PKT *sp, bool api)
+static void list_terminated_jobs(STATUS_PKT *sp)
{
char dt[MAX_TIME_LENGTH], b1[30], b2[30];
char level[10];
struct s_last_job *je;
const char *msg;
- if (!api) {
+ if (!sp->api) {
msg = _("\nTerminated Jobs:\n");
sendit(msg, strlen(msg), sp);
}
if (last_jobs->size() == 0) {
- if (!api) sendit(_("====\n"), 5, sp);
+ if (!sp->api) sendit(_("====\n"), 5, sp);
return;
}
lock_last_jobs_list();
- if (!api) {
+ if (!sp->api) {
msg = _(" JobId Level Files Bytes Status Finished Name \n");
sendit(msg, strlen(msg), sp);
msg = _("======================================================================\n");
*p = 0;
}
}
- if (api) {
+ if (sp->api) {
bsnprintf(buf, sizeof(buf), _("%6d\t%-6s\t%8s\t%10s\t%-7s\t%-8s\t%s\n"),
je->JobId,
level,
}
sendit(buf, strlen(buf), sp);
}
- if (!api) sendit(_("====\n"), 5, sp);
+ if (!sp->api) sendit(_("====\n"), 5, sp);
unlock_last_jobs_list();
}
user->fsend("\n");
sp.bs = user;
+ sp.api = false; /* no API output */
output_status(&sp);
user->signal(BNET_EOD);
dir->fsend(DotStatusJob, job->JobId, job->JobStatus, job->Errors);
}
} else if (strcasecmp(cmd, "header") == 0) {
- list_status_header(&sp, true/*api*/);
+ sp.api = true;
+ list_status_header(&sp);
} else if (strcasecmp(cmd, "running") == 0) {
- list_running_jobs(&sp, true/*api*/);
+ sp.api = true;
+ list_running_jobs(&sp);
} else if (strcasecmp(cmd, "terminated") == 0) {
- list_terminated_jobs(&sp, true/*api*/);
+ 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);