/*
- * Bacula File Daemon Status routines
- *
- * Kern Sibbald, August MMI
- *
- * Version $Id$
- *
- */
-/*
- Copyright (C) 2000-2004 Kern Sibbald and John Walker
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2001-2011 Free Software Foundation Europe e.V.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version three of the GNU Affero General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ 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.
+*/
+/*
+ * Bacula File Daemon Status routines
+ *
+ * Kern Sibbald, August MMI
+ *
*/
#include "bacula.h"
#include "filed.h"
+#include "lib/status.h"
+
+extern void *start_heap;
+
+extern bool GetWindowsVersionString(char *buf, int maxsiz);
-extern char my_name[];
-extern int num_jobs_run;
-extern time_t daemon_start_time;
/* Forward referenced functions */
-static void list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg);
-static void bsock_sendit(const char *msg, int len, void *arg);
+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);
/* Static variables */
static char OKqstatus[] = "2000 OK .status\n";
static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n";
-#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
+#if defined(HAVE_WIN32)
static int privs = 0;
#endif
+#ifdef WIN32_VSS
+#include "vss.h"
+#define VSS " VSS"
+extern VSSClient *g_pVSSClient;
+#else
+#define VSS ""
+#endif
/*
* General status generator
*/
-static void do_status(void sendit(const char *msg, int len, void *sarg), void *arg)
+void output_status(STATUS_PKT *sp)
{
- int sec, bps;
- char *msg, b1[32], b2[32], b3[32], b4[32];
- int found, len;
- JCR *njcr;
+ list_status_header(sp);
+ list_running_jobs(sp);
+ list_terminated_jobs(sp);
+}
+
+static void list_status_header(STATUS_PKT *sp)
+{
+ POOL_MEM msg(PM_MESSAGE);
+ char b1[32], b2[32], b3[32], b4[32], b5[35];
+ int len;
char dt[MAX_TIME_LENGTH];
- msg = (char *)get_pool_memory(PM_MESSAGE);
- found = 0;
- len = Mmsg(msg, "%s Version: " VERSION " (" BDATE ") %s %s %s\n", my_name,
- HOST_OS, DISTNAME, DISTVER);
- sendit(msg, len, arg);
+ len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s %s\n"),
+ my_name, VERSION, BDATE, VSS, HOST_OS, DISTNAME, DISTVER);
+ sendit(msg.c_str(), len, sp);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
- len = Mmsg(msg, _("Daemon started %s, %d Job%s run since started.\n"),
- dt, num_jobs_run, num_jobs_run == 1 ? "" : "s");
- sendit(msg, len, arg);
-#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
+ len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d.\n"),
+ dt, num_jobs_run, job_count());
+ sendit(msg.c_str(), len, sp);
+#if defined(HAVE_WIN32)
+ char buf[300];
+ if (GetWindowsVersionString(buf, sizeof(buf))) {
+ len = Mmsg(msg, "%s\n", buf);
+ sendit(msg.c_str(), len, sp);
+ }
if (debug_level > 0) {
if (!privs) {
- privs = enable_backup_privileges(NULL, 1);
+ privs = enable_backup_privileges(NULL, 1);
}
- len = Mmsg(msg,
- _(" Priv 0x%x APIs=%sOPT,%sATP,%sLPV,%sGFAE,%sBR,%sBW,%sSPSP\n"), privs,
- p_OpenProcessToken?"":"!",
- p_AdjustTokenPrivileges?"":"!",
- p_LookupPrivilegeValue?"":"!",
- p_GetFileAttributesEx?"":"!",
- p_BackupRead?"":"!",
- p_BackupWrite?"":"!",
- p_SetProcessShutdownParameters?"":"!");
- sendit(msg, len, arg);
+ len = Mmsg(msg, "VSS %s, Priv 0x%x\n", g_pVSSClient?"enabled":"disabled", privs);
+ sendit(msg.c_str(), len, sp);
+ len = Mmsg(msg, "APIs=%sOPT,%sATP,%sLPV,%sCFA,%sCFW,\n",
+ p_OpenProcessToken?"":"!",
+ p_AdjustTokenPrivileges?"":"!",
+ p_LookupPrivilegeValue?"":"!",
+ p_CreateFileA?"":"!",
+ p_CreateFileW?"":"!");
+ sendit(msg.c_str(), len, sp);
+ len = Mmsg(msg, " %sWUL,%sWMKD,%sGFAA,%sGFAW,%sGFAEA,%sGFAEW,%sSFAA,%sSFAW,%sBR,%sBW,%sSPSP,\n",
+ p_wunlink?"":"!",
+ p_wmkdir?"":"!",
+ p_GetFileAttributesA?"":"!",
+ p_GetFileAttributesW?"":"!",
+ p_GetFileAttributesExA?"":"!",
+ p_GetFileAttributesExW?"":"!",
+ p_SetFileAttributesA?"":"!",
+ p_SetFileAttributesW?"":"!",
+ p_BackupRead?"":"!",
+ p_BackupWrite?"":"!",
+ p_SetProcessShutdownParameters?"":"!");
+ sendit(msg.c_str(), len, sp);
+ len = Mmsg(msg, " %sWC2MB,%sMB2WC,%sFFFA,%sFFFW,%sFNFA,%sFNFW,%sSCDA,%sSCDW,\n",
+ p_WideCharToMultiByte?"":"!",
+ p_MultiByteToWideChar?"":"!",
+ p_FindFirstFileA?"":"!",
+ p_FindFirstFileW?"":"!",
+ p_FindNextFileA?"":"!",
+ p_FindNextFileW?"":"!",
+ p_SetCurrentDirectoryA?"":"!",
+ p_SetCurrentDirectoryW?"":"!");
+ sendit(msg.c_str(), len, sp);
+ len = Mmsg(msg, " %sGCDA,%sGCDW,%sGVPNW,%sGVNFVMPW\n",
+ p_GetCurrentDirectoryA?"":"!",
+ p_GetCurrentDirectoryW?"":"!",
+ p_GetVolumePathNameW?"":"!",
+ p_GetVolumeNameForVolumeMountPointW?"":"!");
+ sendit(msg.c_str(), len, sp);
}
#endif
- if (debug_level > 0) {
- len = Mmsg(msg, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
- edit_uint64_with_commas(sm_bytes, b1),
- edit_uint64_with_commas(sm_max_bytes, b2),
- edit_uint64_with_commas(sm_buffers, b3),
- edit_uint64_with_commas(sm_max_buffers, b4));
- sendit(msg, len, arg);
- }
- if (debug_level > 0) {
- len = Mmsg(msg, _(" Sizeof: off_t=%d size_t=%d\n"), sizeof(off_t),
- sizeof(size_t));
- sendit(msg, len, arg);
+ len = Mmsg(msg, _(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
+ edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1),
+ edit_uint64_with_commas(sm_bytes, b2),
+ edit_uint64_with_commas(sm_max_bytes, b3),
+ edit_uint64_with_commas(sm_buffers, b4),
+ edit_uint64_with_commas(sm_max_buffers, b5));
+ sendit(msg.c_str(), len, sp);
+ 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 && bplugin_list->size() > 0) {
+ Plugin *plugin;
+ int len;
+ pm_strcpy(msg, "Plugin: ");
+ foreach_alist(plugin, bplugin_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);
}
+}
- list_terminated_jobs(sendit, arg);
-
+static void list_running_jobs_plain(STATUS_PKT *sp)
+{
+ int sec, bps;
+ POOL_MEM msg(PM_MESSAGE);
+ char b1[32], b2[32], b3[32];
+ int len;
+ bool found = false;
+ JCR *njcr;
+ char dt[MAX_TIME_LENGTH];
/*
- * List running jobs
+ * List running jobs
*/
Dmsg0(1000, "Begin status jcr loop.\n");
- len = Mmsg(msg, _("Running Jobs:\n"));
- sendit(msg, len, arg);
- lock_jcr_chain();
+ len = Mmsg(msg, _("\nRunning Jobs:\n"));
+ sendit(msg.c_str(), len, sp);
+ const char *vss = "";
+#ifdef WIN32_VSS
+ if (g_pVSSClient && g_pVSSClient->IsInitialized()) {
+ vss = "VSS ";
+ }
+#endif
foreach_jcr(njcr) {
bstrftime_nc(dt, sizeof(dt), njcr->start_time);
if (njcr->JobId == 0) {
len = Mmsg(msg, _("Director connected at: %s\n"), dt);
} else {
- len = Mmsg(msg, _("JobId %d Job %s is running.\n"),
- njcr->JobId, njcr->Job);
- sendit(msg, len, arg);
- len = Mmsg(msg, _(" %s Job started: %s\n"),
- job_type_to_str(njcr->JobType), dt);
+ len = Mmsg(msg, _("JobId %d Job %s is running.\n"),
+ njcr->JobId, njcr->Job);
+ sendit(msg.c_str(), len, sp);
+ len = Mmsg(msg, _(" %s%s %s Job started: %s\n"),
+ vss, level_to_str(njcr->getJobLevel()),
+ job_type_to_str(njcr->getJobType()), dt);
}
- sendit(msg, len, arg);
+ sendit(msg.c_str(), len, sp);
if (njcr->JobId == 0) {
- free_locked_jcr(njcr);
- continue;
+ continue;
}
sec = time(NULL) - njcr->start_time;
if (sec <= 0) {
- sec = 1;
+ sec = 1;
}
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),
- edit_uint64_with_commas(bps, b3));
- sendit(msg, len, arg);
- len = Mmsg(msg, _(" Files Examined=%s\n"),
- edit_uint64_with_commas(njcr->num_files_examined, b1));
- sendit(msg, len, arg);
+ len = Mmsg(msg, _(" Files=%s Bytes=%s Bytes/sec=%s Errors=%d\n"),
+ edit_uint64_with_commas(njcr->JobFiles, b1),
+ edit_uint64_with_commas(njcr->JobBytes, b2),
+ edit_uint64_with_commas(bps, b3),
+ njcr->JobErrors);
+ sendit(msg.c_str(), len, sp);
+ len = Mmsg(msg, _(" Files Examined=%s\n"),
+ edit_uint64_with_commas(njcr->num_files_examined, b1));
+ sendit(msg.c_str(), len, sp);
if (njcr->JobFiles > 0) {
- P(njcr->mutex);
+ njcr->lock();
len = Mmsg(msg, _(" Processing file: %s\n"), njcr->last_fname);
- V(njcr->mutex);
- sendit(msg, len, arg);
+ njcr->unlock();
+ sendit(msg.c_str(), len, sp);
}
- found = 1;
+ found = true;
if (njcr->store_bsock) {
len = Mmsg(msg, " SDReadSeqNo=%" lld " fd=%d\n",
- njcr->store_bsock->read_seqno, njcr->store_bsock->fd);
- sendit(msg, len, arg);
+ njcr->store_bsock->read_seqno, njcr->store_bsock->m_fd);
+ sendit(msg.c_str(), len, sp);
} else {
len = Mmsg(msg, _(" SDSocket closed.\n"));
- sendit(msg, len, arg);
+ sendit(msg.c_str(), len, sp);
}
- free_locked_jcr(njcr);
}
- unlock_jcr_chain();
- Dmsg0(1000, "Begin status jcr loop.\n");
+ endeach_jcr(njcr);
+
if (!found) {
len = Mmsg(msg, _("No Jobs running.\n"));
- sendit(msg, len, arg);
+ sendit(msg.c_str(), len, sp);
+ }
+ sendit(_("====\n"), 5, sp);
+}
+
+static void list_running_jobs_api(STATUS_PKT *sp)
+{
+ int sec, bps;
+ POOL_MEM msg(PM_MESSAGE);
+ char b1[32], b2[32], b3[32];
+ int len;
+ JCR *njcr;
+ char dt[MAX_TIME_LENGTH];
+ /*
+ * List running jobs for Bat/Bweb (simple to parse)
+ */
+ int vss = 0;
+#ifdef WIN32_VSS
+ if (g_pVSSClient && g_pVSSClient->IsInitialized()) {
+ vss = 1;
+ }
+#endif
+ foreach_jcr(njcr) {
+ bstrutime(dt, sizeof(dt), njcr->start_time);
+ if (njcr->JobId == 0) {
+ len = Mmsg(msg, "DirectorConnected=%s\n", dt);
+ } else {
+ len = Mmsg(msg, "JobId=%d\n Job=%s\n",
+ njcr->JobId, njcr->Job);
+ sendit(msg.c_str(), len, sp);
+ len = Mmsg(msg," VSS=%d\n Level=%c\n JobType=%c\n JobStarted=%s\n",
+ vss, njcr->getJobLevel(),
+ njcr->getJobType(), dt);
+ }
+ sendit(msg.c_str(), len, sp);
+ if (njcr->JobId == 0) {
+ continue;
+ }
+ sec = time(NULL) - njcr->start_time;
+ if (sec <= 0) {
+ sec = 1;
+ }
+ bps = (int)(njcr->JobBytes / sec);
+ len = Mmsg(msg, " Files=%s\n Bytes=%s\n Bytes/sec=%s\n Errors=%d\n",
+ edit_uint64(njcr->JobFiles, b1),
+ edit_uint64(njcr->JobBytes, b2),
+ edit_uint64(bps, b3),
+ njcr->JobErrors);
+ sendit(msg.c_str(), len, sp);
+ len = Mmsg(msg, " Files Examined=%s\n",
+ edit_uint64(njcr->num_files_examined, b1));
+ sendit(msg.c_str(), len, sp);
+ if (njcr->JobFiles > 0) {
+ njcr->lock();
+ len = Mmsg(msg, " Processing file=%s\n", njcr->last_fname);
+ njcr->unlock();
+ sendit(msg.c_str(), len, sp);
+ }
+
+ if (njcr->store_bsock) {
+ len = Mmsg(msg, " SDReadSeqNo=%" lld "\n fd=%d\n",
+ njcr->store_bsock->read_seqno, njcr->store_bsock->m_fd);
+ sendit(msg.c_str(), len, sp);
+ } else {
+ len = Mmsg(msg, _(" SDSocket=closed\n"));
+ sendit(msg.c_str(), len, sp);
+ }
}
- len = Mmsg(msg, _("====\n"));
- sendit(msg, len, arg);
- free_pool_memory(msg);
+ endeach_jcr(njcr);
}
-static void list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg)
+static void list_running_jobs(STATUS_PKT *sp)
+{
+ if (sp->api) {
+ list_running_jobs_api(sp);
+ } else {
+ list_running_jobs_plain(sp);
+ }
+}
+
+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 (!sp->api) {
+ msg = _("\nTerminated Jobs:\n");
+ sendit(msg, strlen(msg), sp);
+ }
+
if (last_jobs->size() == 0) {
- msg = _("No Terminated Jobs.\n");
- sendit(msg, strlen(msg), arg);
+ if (!sp->api) sendit(_("====\n"), 5, sp);
return;
}
lock_last_jobs_list();
- sendit("\n", 1, arg); /* send separately */
- msg = _("Terminated Jobs:\n");
- sendit(msg, strlen(msg), arg);
- msg = _(" JobId Level Files Bytes Status Finished Name \n");
- sendit(msg, strlen(msg), arg);
- msg = _("======================================================================\n");
- sendit(msg, strlen(msg), arg);
+ if (!sp->api) {
+ msg = _(" JobId Level Files Bytes Status Finished Name \n");
+ sendit(msg, strlen(msg), sp);
+ msg = _("======================================================================\n");
+ sendit(msg, strlen(msg), sp);
+ }
foreach_dlist(je, last_jobs) {
char JobName[MAX_NAME_LENGTH];
const char *termstat;
case JT_ADMIN:
case JT_RESTORE:
bstrncpy(level, " ", sizeof(level));
- break;
+ break;
default:
- bstrncpy(level, level_to_str(je->JobLevel), sizeof(level));
- level[4] = 0;
- break;
+ bstrncpy(level, level_to_str(je->JobLevel), sizeof(level));
+ level[4] = 0;
+ break;
}
switch (je->JobStatus) {
case JS_Created:
- termstat = "Created";
- break;
+ termstat = _("Created");
+ break;
case JS_FatalError:
case JS_ErrorTerminated:
- termstat = "Error";
- break;
+ termstat = _("Error");
+ break;
case JS_Differences:
- termstat = "Diffs";
- break;
+ termstat = _("Diffs");
+ break;
case JS_Canceled:
- termstat = "Cancel";
- break;
+ termstat = _("Cancel");
+ break;
case JS_Terminated:
- termstat = "OK";
- break;
+ termstat = _("OK");
+ break;
default:
- termstat = "Other";
- break;
+ termstat = _("Other");
+ break;
}
bstrncpy(JobName, je->Job, sizeof(JobName));
/* There are three periods after the Job name */
char *p;
for (int i=0; i<3; i++) {
if ((p=strrchr(JobName, '.')) != NULL) {
- *p = 0;
- }
+ *p = 0;
+ }
}
- bsnprintf(buf, sizeof(buf), _("%6d %-6s %8s %14s %-7s %-8s %s\n"),
- je->JobId,
- level,
- edit_uint64_with_commas(je->JobFiles, b1),
- edit_uint64_with_commas(je->JobBytes, b2),
- termstat,
- dt, JobName);
- sendit(buf, strlen(buf), arg);
+ 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);
}
- sendit("====\n", 5, arg);
+ if (!sp->api) sendit(_("====\n"), 5, sp);
unlock_last_jobs_list();
}
/*
* Send to bsock (Director or Console)
*/
-static void bsock_sendit(const char *msg, int len, void *arg)
+static void sendit(const char *msg, int len, STATUS_PKT *sp)
{
- BSOCK *user = (BSOCK *)arg;
-
- user->msg = check_pool_memory_size(user->msg, len+1);
- memcpy(user->msg, msg, len+1);
- user->msglen = len+1;
- bnet_send(user);
+ if (sp->bs) {
+ BSOCK *user = sp->bs;
+ user->msg = check_pool_memory_size(user->msg, len+1);
+ memcpy(user->msg, msg, len+1);
+ user->msglen = len+1;
+ user->send();
+ } else {
+ sp->callback(msg, len, sp->context);
+ }
}
-
+
/*
* Status command from Director
*/
int status_cmd(JCR *jcr)
{
BSOCK *user = jcr->dir_bsock;
+ STATUS_PKT sp;
- bnet_fsend(user, "\n");
- do_status(bsock_sendit, (void *)user);
+ user->fsend("\n");
+ sp.bs = user;
+ sp.api = false; /* no API output */
+ output_status(&sp);
- bnet_sig(user, BNET_EOD);
+ user->signal(BNET_EOD);
return 1;
}
int qstatus_cmd(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
- char *time;
+ POOLMEM *cmd;
JCR *njcr;
s_last_job* job;
+ STATUS_PKT sp;
+
+ sp.bs = dir;
+ cmd = get_memory(dir->msglen+1);
- time = (char *) alloca(dir->msglen+1);
-
- if (sscanf(dir->msg, qstatus, time) != 1) {
+ if (sscanf(dir->msg, qstatus, cmd) != 1) {
pm_strcpy(&jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
- bnet_fsend(dir, "2900 Bad .status command, missing argument.\n");
- bnet_sig(dir, BNET_EOD);
+ dir->fsend(_("2900 Bad .status command, missing argument.\n"));
+ dir->signal(BNET_EOD);
+ free_memory(cmd);
return 0;
}
- unbash_spaces(time);
-
- if (strcmp(time, "current") == 0) {
- bnet_fsend(dir, OKqstatus, time);
- lock_jcr_chain();
+ unbash_spaces(cmd);
+
+ if (strcmp(cmd, "current") == 0) {
+ dir->fsend(OKqstatus, cmd);
foreach_jcr(njcr) {
if (njcr->JobId != 0) {
- bnet_fsend(dir, DotStatusJob, njcr->JobId, njcr->JobStatus, njcr->JobErrors);
+ dir->fsend(DotStatusJob, njcr->JobId, njcr->JobStatus, njcr->JobErrors);
}
- free_locked_jcr(njcr);
}
- unlock_jcr_chain();
- }
- else if (strcmp(time, "last") == 0) {
- bnet_fsend(dir, OKqstatus, time);
+ endeach_jcr(njcr);
+ } else if (strcmp(cmd, "last") == 0) {
+ dir->fsend(OKqstatus, cmd);
if ((last_jobs) && (last_jobs->size() > 0)) {
job = (s_last_job*)last_jobs->last();
- bnet_fsend(dir, DotStatusJob, job->JobId, job->JobStatus, job->Errors);
+ dir->fsend(DotStatusJob, job->JobId, job->JobStatus, job->Errors);
}
- }
- else {
+ } else if (strcasecmp(cmd, "header") == 0) {
+ sp.api = true;
+ list_status_header(&sp);
+ } else if (strcasecmp(cmd, "running") == 0) {
+ sp.api = true;
+ list_running_jobs(&sp);
+ } else if (strcasecmp(cmd, "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);
- bnet_fsend(dir, "2900 Bad .status command, wrong argument.\n");
- bnet_sig(dir, BNET_EOD);
+ dir->fsend(_("2900 Bad .status command, wrong argument.\n"));
+ dir->signal(BNET_EOD);
+ free_memory(cmd);
return 0;
}
-
- bnet_sig(dir, BNET_EOD);
+
+ dir->signal(BNET_EOD);
+ free_memory(cmd);
return 1;
}
/*
* Convert Job Level into a string
*/
-static const char *level_to_str(int level)
+static const char *level_to_str(int level)
{
const char *str;
}
-#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
-#include <windows.h>
-
+#if defined(HAVE_WIN32)
int bacstat = 0;
-struct s_win32_arg {
- HWND hwnd;
- int idlist;
-};
-
/*
* Put message in Window List Box
*/
-static void win32_sendit(const char *msg, int len, void *marg)
-{
- struct s_win32_arg *arg = (struct s_win32_arg *)marg;
-
- if (len > 0 && msg[len-1] == '\n') {
- // when compiling with visual studio some strings are read-only
- // and cause access violations. So we creat a tmp copy.
- char *_msg = (char *)alloca(len);
- bstrncpy(_msg, msg, len);
- msg = _msg;
- }
- SendDlgItemMessage(arg->hwnd, arg->idlist, LB_ADDSTRING, 0, (LONG)msg);
-
-}
-
-void FillStatusBox(HWND hwnd, int idlist)
-{
- struct s_win32_arg arg;
-
- arg.hwnd = hwnd;
- arg.idlist = idlist;
-
- /* Empty box */
- for ( ; SendDlgItemMessage(hwnd, idlist, LB_DELETESTRING, 0, (LONG)0) > 0; )
- { }
- do_status(win32_sendit, (void *)&arg);
-}
-
char *bac_status(char *buf, int buf_len)
{
JCR *njcr;
- const char *termstat = _("Bacula Idle");
+ const char *termstat = _("Bacula Client: Idle");
struct s_last_job *job;
- int stat = 0; /* Idle */
+ int stat = 0; /* Idle */
if (!last_jobs) {
goto done;
}
Dmsg0(1000, "Begin bac_status jcr loop.\n");
- lock_jcr_chain();
foreach_jcr(njcr) {
if (njcr->JobId != 0) {
- stat = JS_Running;
- termstat = _("Bacula Running");
- free_locked_jcr(njcr);
- break;
+ stat = JS_Running;
+ termstat = _("Bacula Client: Running");
+ break;
}
- free_locked_jcr(njcr);
}
- unlock_jcr_chain();
+ endeach_jcr(njcr);
+
if (stat != 0) {
goto done;
}
stat = job->JobStatus;
switch (job->JobStatus) {
case JS_Canceled:
- termstat = _("Last Job Canceled");
- break;
+ termstat = _("Bacula Client: Last Job Canceled");
+ break;
case JS_ErrorTerminated:
- case JS_FatalError:
- termstat = _("Last Job Failed");
- break;
+ case JS_FatalError:
+ termstat = _("Bacula Client: Last Job Failed");
+ break;
default:
- if (job->Errors) {
- termstat = _("Last Job had Warnings");
- }
- break;
+ if (job->Errors) {
+ termstat = _("Bacula Client: Last Job had Warnings");
+ }
+ break;
}
}
Dmsg0(1000, "End bac_status jcr loop.\n");
return buf;
}
-#endif /* HAVE_CYGWIN */
+#endif /* HAVE_WIN32 */
projects / bacula / bacula / blobdiff