#include "bacula.h"
#include "filed.h"
-extern char my_name[];
-extern int num_jobs_run;
-extern time_t daemon_start_time;
-extern bool get_trace(void);
-
/* 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 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
/*
* General status generator
*/
-static void do_status(void sendit(const char *msg, int len, void *sarg), void *arg)
+void output_status(void sendit(const char *msg, int len, void *sarg), void *arg)
{
int sec, bps;
char *msg, b1[32], b2[32], b3[32], b4[32];
- int found, len;
+ int len;
+ bool found = false;
JCR *njcr;
char dt[MAX_TIME_LENGTH];
msg = (char *)get_pool_memory(PM_MESSAGE);
- found = 0;
len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s %s\n"),
my_name, VERSION, BDATE, VSS, HOST_OS, DISTNAME, DISTVER);
sendit(msg, len, arg);
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)
+#if defined(HAVE_WIN32)
if (debug_level > 0) {
if (!privs) {
privs = enable_backup_privileges(NULL, 1);
len = Mmsg(msg, " %sWUL,%sWMKD,%sWOP,%sGFAA,%sGFAW,%sGFAEA,%sGFAEW,%sSFAA,%sSFAW,%sBR,%sBW,%sSPSP,\n",
p_wunlink?"":"!",
p_wmkdir?"":"!",
- p_wopen?"":"!",
p_GetFileAttributesA?"":"!",
p_GetFileAttributesW?"":"!",
p_GetFileAttributesExA?"":"!",
sendit(msg, len, arg);
}
#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);
- len = Mmsg(msg, _(" Sizeof: off_t=%d size_t=%d debug=%d trace=%d\n"),
- sizeof(off_t), sizeof(size_t), debug_level, get_trace());
- sendit(msg, len, arg);
- }
-
- list_terminated_jobs(sendit, arg);
+ 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);
+ len = Mmsg(msg, _(" Sizeof: off_t=%d size_t=%d debug=%d trace=%d\n"),
+ sizeof(off_t), sizeof(size_t), debug_level, get_trace());
+ sendit(msg, len, arg);
/*
* List running jobs
*/
Dmsg0(1000, "Begin status jcr loop.\n");
- len = Mmsg(msg, _("Running Jobs:\n"));
+ len = Mmsg(msg, _("\nRunning Jobs:\n"));
sendit(msg, len, arg);
char *vss = "";
#ifdef WIN32_VSS
sendit(msg, len, arg);
}
- 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);
}
endeach_jcr(njcr);
- Dmsg0(1000, "Begin status jcr loop.\n");
if (!found) {
len = Mmsg(msg, _("No Jobs running.\n"));
sendit(msg, len, arg);
}
- len = Mmsg(msg, _("====\n"));
- sendit(msg, len, arg);
+ sendit(_("====\n"), 5, arg);
+
+ list_terminated_jobs(sendit, arg);
+
free_pool_memory(msg);
}
struct s_last_job *je;
const char *msg;
+ msg = _("\nTerminated Jobs:\n");
+ sendit(msg, strlen(msg), arg);
+
if (last_jobs->size() == 0) {
- msg = _("No Terminated Jobs.\n");
- sendit(msg, strlen(msg), arg);
+ sendit(_("====\n"), 5, arg);
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");
+ msg = _(" JobId Level Files Bytes Status Finished Name \n");
sendit(msg, strlen(msg), arg);
msg = _("======================================================================\n");
sendit(msg, strlen(msg), arg);
*p = 0;
}
}
- bsnprintf(buf, sizeof(buf), _("%6d %-6s %8s %14s %-7s %-8s %s\n"),
+ 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_commas(je->JobBytes, b2),
+ edit_uint64_with_suffix(je->JobBytes, b2),
termstat,
dt, JobName);
sendit(buf, strlen(buf), arg);
BSOCK *user = jcr->dir_bsock;
bnet_fsend(user, "\n");
- do_status(bsock_sendit, (void *)user);
+ output_status(bsock_sendit, (void *)user);
bnet_sig(user, BNET_EOD);
return 1;
}
-#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 */
foreach_jcr(njcr) {
if (njcr->JobId != 0) {
stat = JS_Running;
- termstat = _("Bacula Running");
+ termstat = _("Bacula Client: Running");
break;
}
}
stat = job->JobStatus;
switch (job->JobStatus) {
case JS_Canceled:
- termstat = _("Last Job Canceled");
+ termstat = _("Bacula Client: Last Job Canceled");
break;
case JS_ErrorTerminated:
case JS_FatalError:
- termstat = _("Last Job Failed");
+ termstat = _("Bacula Client: Last Job Failed");
break;
default:
if (job->Errors) {
- termstat = _("Last Job had Warnings");
+ termstat = _("Bacula Client: Last Job had Warnings");
}
break;
}
return buf;
}
-#endif /* HAVE_CYGWIN */
+#endif /* HAVE_WIN32 */
projects / bacula / bacula / blobdiff