#include "filed.h"
extern char my_name[];
-extern struct s_last_job last_job;
+extern int num_jobs_run;
extern time_t daemon_start_time;
/* Forward referenced functions */
-static void list_terminated_jobs(void *arg);
-static void sendit(char *msg, int len, void *arg);
+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 *level_to_str(int level);
-#ifdef HAVE_CYGWIN
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
static int privs = 0;
#endif
/*
* General status generator
*/
-static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
+static void do_status(void sendit(const char *msg, int len, void *sarg), void *arg)
{
int sec, bps;
char *msg, b1[32], b2[32], b3[32];
len = Mmsg(&msg, "%s Version: " VERSION " (" BDATE ") %s %s %s\n", my_name,
HOST_OS, DISTNAME, DISTVER);
sendit(msg, len, arg);
- bstrftime(dt, sizeof(dt), daemon_start_time);
- strcpy(dt+7, dt+9); /* cut century */
- len = Mmsg(&msg, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
- last_job.NumJobs == 1 ? "" : "s");
+ 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);
-#ifdef HAVE_CYGWIN
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
if (debug_level > 0) {
if (!privs) {
privs = enable_backup_privileges(NULL, 1);
}
#endif
- list_terminated_jobs(arg);
-
-#ifdef xxx
- char termstat[30];
- struct s_last_job *je;
- lock_last_jobs_list();
- for (je=NULL; (je=(s_last_job *)last_jobs->next(je)); ) {
- bstrftime(dt, sizeof(dt), je->end_time);
- strcpy(dt+7, dt+9); /* cut century */
- len = Mmsg(&msg, _("Last Job %s finished at %s\n"), je->Job, dt);
- sendit(msg, len, arg);
-
- jobstatus_to_ascii(je->JobStatus, termstat, sizeof(termstat));
- len = Mmsg(&msg, _(" Files=%s Bytes=%s Termination Status=%s\n"),
- edit_uint64_with_commas(je->JobFiles, b1),
- edit_uint64_with_commas(je->JobBytes, b2),
- termstat);
- sendit(msg, len, arg);
- }
- unlock_last_jobs_list();
-#endif
+ list_terminated_jobs(sendit, arg);
/*
* List running jobs
*/
- Dmsg0(200, "Begin status jcr loop.\n");
+ Dmsg0(1000, "Begin status jcr loop.\n");
+ len = Mmsg(&msg, _("Running Jobs:\n"));
+ sendit(msg, len, arg);
lock_jcr_chain();
- for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
- bstrftime(dt, sizeof(dt), njcr->start_time);
- strcpy(dt+7, dt+9); /* cut century */
+ 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 {
if (sec <= 0) {
sec = 1;
}
- bps = njcr->JobBytes / sec;
+ 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),
free_locked_jcr(njcr);
}
unlock_jcr_chain();
- Dmsg0(200, "Begin status jcr loop.\n");
+ Dmsg0(1000, "Begin status jcr loop.\n");
if (!found) {
- len = Mmsg(&msg, _("No jobs running.\n"));
+ len = Mmsg(&msg, _("No Jobs running.\n"));
sendit(msg, len, arg);
}
+ len = Mmsg(&msg, _("====\n"));
+ sendit(msg, len, arg);
free_pool_memory(msg);
}
-static void list_terminated_jobs(void *arg)
+static void list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg)
{
char dt[MAX_TIME_LENGTH], b1[30], b2[30];
char level[10];
struct s_last_job *je;
- char *msg;
+ const char *msg;
- if (last_job.NumJobs == 0) {
+ if (last_jobs->size() == 0) {
msg = _("No Terminated Jobs.\n");
sendit(msg, strlen(msg), arg);
return;
}
lock_last_jobs_list();
- msg = _("\nTerminated Jobs:\n");
+ 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");
+ msg = _("======================================================================\n");
sendit(msg, strlen(msg), arg);
- for (je=NULL; (je=(s_last_job *)last_jobs->next(je)); ) {
+ foreach_dlist(je, last_jobs) {
char JobName[MAX_NAME_LENGTH];
char *termstat;
char buf[1000];
- bstrftime(dt, sizeof(dt), je->end_time);
- strcpy(dt+7, dt+9); /* cut century */
+ bstrftime_nc(dt, sizeof(dt), je->end_time);
switch (je->JobType) {
case JT_ADMIN:
case JT_RESTORE:
*p = 0;
}
}
- bsnprintf(buf, sizeof(buf), _("%6d %-4s %8s %12s %-7s %-8s %s\n"),
+ bsnprintf(buf, sizeof(buf), _("%6d %-6s %8s %14s %-7s %-8s %s\n"),
je->JobId,
level,
edit_uint64_with_commas(je->JobFiles, b1),
dt, JobName);
sendit(buf, strlen(buf), arg);
}
- sendit("\n", 1, arg);
+ sendit("====\n", 5, arg);
unlock_last_jobs_list();
}
/*
- * Send to Director
+ * Send to bsock (Director or Console)
*/
-static void sendit(char *msg, int len, void *arg)
+static void bsock_sendit(const char *msg, int len, void *arg)
{
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);
BSOCK *user = jcr->dir_bsock;
bnet_fsend(user, "\n");
- do_status(sendit, (void *)user);
- bnet_fsend(user, "====\n");
+ do_status(bsock_sendit, (void *)user);
bnet_sig(user, BNET_EOD);
return 1;
}
-#ifdef HAVE_CYGWIN
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
#include <windows.h>
static char buf[100];
/*
* Put message in Window List Box
*/
-static void win32_sendit(char *msg, int len, void *marg)
+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] = 0; /* eliminate newline */
+ 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);
+ strncpy(_msg, msg, len-1);
+ _msg[len-1] = 0;
+ msg = _msg;
}
SendDlgItemMessage(arg->hwnd, arg->idlist, LB_ADDSTRING, 0, (LONG)msg);
{
JCR *njcr;
char *termstat = _("Bacula Idle");
+ struct s_last_job *job;
bacstat = 0;
- if (last_job.NumJobs > 0) {
- switch (last_job.JobStatus) {
- case JS_ErrorTerminated:
- bacstat = -1;
- termstat = _("Last Job Erred");
- break;
- default:
- break;
+ if (!last_jobs) {
+ return _("Bacula Terminated");
+ }
+ if (last_jobs->size() > 0) {
+ job = (struct s_last_job *)last_jobs->first();
+ switch (job->JobStatus) {
+ case JS_Canceled:
+ bacstat = -1;
+ termstat = _("Last Job Canceled");
+ break;
+ case JS_ErrorTerminated:
+ bacstat = -1;
+ termstat = _("Last Job Failed");
+ break;
+ default:
+ break;
}
}
- Dmsg0(200, "Begin bac_status jcr loop.\n");
+ Dmsg0(1000, "Begin bac_status jcr loop.\n");
lock_jcr_chain();
- for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
+ foreach_jcr(njcr) {
if (njcr->JobId != 0) {
bacstat = 1;
termstat = _("Bacula Running");
free_locked_jcr(njcr);
}
unlock_jcr_chain();
- Dmsg0(200, "End bac_status jcr loop.\n");
- strcpy(buf, termstat);
+ Dmsg0(1000, "End bac_status jcr loop.\n");
+ bstrncpy(buf, termstat, sizeof(buf));
return buf;
}
projects / bacula / bacula / blobdiff