extern struct s_last_job last_job;
extern time_t daemon_start_time;
+/* Forward referenced functions */
+static void list_terminated_jobs(void sendit(char *msg, int len, void *sarg), void *arg);
+static void bsock_sendit(char *msg, int len, void *arg);
+static char *level_to_str(int level);
+
+
#ifdef HAVE_CYGWIN
static int privs = 0;
#endif
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);
+ bstrftime_nc(dt, sizeof(dt), daemon_start_time);
len = Mmsg(&msg, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
last_job.NumJobs == 1 ? "" : "s");
sendit(msg, len, arg);
#ifdef HAVE_CYGWIN
- if (!privs) {
- privs = enable_backup_privileges(NULL, 1);
+ if (debug_level > 0) {
+ if (!privs) {
+ 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,
- _("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);
#endif
- if (last_job.NumJobs > 0) {
+ list_terminated_jobs(sendit, 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_nc(dt, sizeof(dt), je->end_time);
+ len = Mmsg(&msg, _("Last Job %s finished at %s\n"), je->Job, dt);
+ sendit(msg, len, arg);
- bstrftime(dt, sizeof(dt), last_job.end_time);
- len = Mmsg(&msg, _("Last Job %s finished at %s\n"), last_job.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
- jobstatus_to_ascii(last_job.JobStatus, termstat, sizeof(termstat));
- len = Mmsg(&msg, _(" Files=%s Bytes=%s Termination Status=%s\n"),
- edit_uint64_with_commas(last_job.JobFiles, b1),
- edit_uint64_with_commas(last_job.JobBytes, b2),
- termstat);
- sendit(msg, len, arg);
- }
+ /*
+ * List running jobs
+ */
Dmsg0(200, "Begin status jcr loop.\n");
lock_jcr_chain();
for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
- bstrftime(dt, sizeof(dt), njcr->start_time);
+ bstrftime_nc(dt, sizeof(dt), njcr->start_time);
if (njcr->JobId == 0) {
len = Mmsg(&msg, _("Director connected at: %s\n"), dt);
} else {
free_pool_memory(msg);
}
+static void list_terminated_jobs(void sendit(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;
+
+ if (last_job.NumJobs == 0) {
+ msg = _("No Terminated Jobs.\n");
+ sendit(msg, strlen(msg), 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");
+ sendit(msg, strlen(msg), arg);
+ msg = _("======================================================================\n");
+ sendit(msg, strlen(msg), arg);
+ for (je=NULL; (je=(s_last_job *)last_jobs->next(je)); ) {
+ char JobName[MAX_NAME_LENGTH];
+ char *termstat;
+ char buf[1000];
+
+ bstrftime_nc(dt, sizeof(dt), je->end_time);
+ switch (je->JobType) {
+ case JT_ADMIN:
+ case JT_RESTORE:
+ bstrncpy(level, " ", sizeof(level));
+ break;
+ default:
+ bstrncpy(level, level_to_str(je->JobLevel), sizeof(level));
+ level[4] = 0;
+ break;
+ }
+ switch (je->JobStatus) {
+ case JS_Created:
+ termstat = "Created";
+ break;
+ case JS_FatalError:
+ case JS_ErrorTerminated:
+ termstat = "Error";
+ break;
+ case JS_Differences:
+ termstat = "Diffs";
+ break;
+ case JS_Canceled:
+ termstat = "Cancel";
+ break;
+ case JS_Terminated:
+ termstat = "OK";
+ break;
+ default:
+ 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;
+ }
+ }
+ bsnprintf(buf, sizeof(buf), _("%6d %-4s %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);
+ }
+ sendit("\n", 1, 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(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);
+ do_status(bsock_sendit, (void *)user);
bnet_fsend(user, "====\n");
bnet_sig(user, BNET_EOD);
}
+/*
+ * Convert Job Level into a string
+ */
+static char *level_to_str(int level)
+{
+ char *str;
+
+ switch (level) {
+ case L_BASE:
+ str = _("Base");
+ case L_FULL:
+ str = _("Full");
+ break;
+ case L_INCREMENTAL:
+ str = _("Incremental");
+ break;
+ case L_DIFFERENTIAL:
+ str = _("Differential");
+ break;
+ case L_SINCE:
+ str = _("Since");
+ break;
+ case L_VERIFY_CATALOG:
+ str = _("Verify Catalog");
+ break;
+ case L_VERIFY_INIT:
+ str = _("Init Catalog");
+ break;
+ case L_VERIFY_VOLUME_TO_CATALOG:
+ str = _("Volume to Catalog");
+ break;
+ case L_VERIFY_DISK_TO_CATALOG:
+ str = _("Disk to Catalog");
+ break;
+ case L_VERIFY_DATA:
+ str = _("Data");
+ break;
+ case L_NONE:
+ str = " ";
+ break;
+ default:
+ str = _("Unknown Job Level");
+ break;
+ }
+ return str;
+}
+
+
#ifdef HAVE_CYGWIN
#include <windows.h>
{
struct s_win32_arg *arg = (struct s_win32_arg *)marg;
- if (len > 0) {
+ if (len > 0 && msg[len-1] == '\n') {
msg[len-1] = 0; /* eliminate newline */
}
SendDlgItemMessage(arg->hwnd, arg->idlist, LB_ADDSTRING, 0, (LONG)msg);
bacstat = 0;
if (last_job.NumJobs > 0) {
switch (last_job.JobStatus) {
- case JS_ErrorTerminated:
- bacstat = -1;
- termstat = _("Last Job Erred");
- break;
- default:
- break;
+ 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");
}
unlock_jcr_chain();
Dmsg0(200, "End bac_status jcr loop.\n");
- strcpy(buf, termstat);
+ bstrncpy(buf, termstat, sizeof(buf));
return buf;
}
projects / bacula / bacula / blobdiff