X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fstatus.c;h=68f8219df4a6c900202ce9cda86ec91a4c191d40;hb=94e47abe723b0a8c73198a74e6277b5fbc13d930;hp=3b6902c7233ccaef9f23390ce1b7bf5075075dc2;hpb=b97cb10b837d390fd26a0b6a47c3b6ec4f8c9970;p=bacula%2Fbacula

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 3b6902c723..68f8219df4 100755
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -33,14 +33,20 @@ extern char my_name[];
 extern struct s_last_job last_job;
 extern time_t daemon_start_time;
 
-#ifdef HAVE_CYGWIN
+/* 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 *level_to_str(int level);
+
+
+#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];
@@ -50,46 +56,40 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
 
    msg = (char *)get_pool_memory(PM_MESSAGE);
    found = 0;
-   len = Mmsg(&msg, "%s Version: " VERSION " (" BDATE ")\n", my_name);
+   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);
-   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.\n"), dt, last_jobs->size(),
+        last_jobs->size() == 1 ? "" : "s");
    sendit(msg, len, arg);
-#ifdef HAVE_CYGWIN
-   if (!privs) {
-      privs = enable_backup_privileges(NULL, 1);
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
+   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) {
-      char termstat[30];
+   list_terminated_jobs(sendit, 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(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);
-   }
-   Dmsg0(200, "Begin status jcr loop.\n");
+   /*
+    * List running jobs  
+    */
+   Dmsg0(1000, "Begin status jcr loop.\n");
    lock_jcr_chain();
-   for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
-      bstrftime(dt, sizeof(dt), njcr->start_time);
+   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 {
@@ -136,7 +136,7 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
       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"));
       sendit(msg, len, arg);
@@ -144,13 +144,93 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
    free_pool_memory(msg);
 }
 
+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;
+   const char *msg;
+
+   if (last_jobs->size() == 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);
+   foreach_dlist(je, last_jobs) {
+      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(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);
@@ -164,7 +244,7 @@ int status_cmd(JCR *jcr)
    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);
@@ -172,7 +252,55 @@ int status_cmd(JCR *jcr)
 }
 
 
-#ifdef HAVE_CYGWIN
+/*
+ * 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;
+}
+
+
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
 #include <windows.h>
 
 static char buf[100];
@@ -186,12 +314,17 @@ struct s_win32_arg {
 /*
  * 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);
    
@@ -216,17 +349,21 @@ char *bac_status(int stat)
    char *termstat = _("Bacula Idle");
 
    bacstat = 0;
-   if (last_job.NumJobs > 0) {
+   if (last_jobs->size() > 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");
+   Dmsg0(1000, "Begin bac_status jcr loop.\n");
    lock_jcr_chain();
    for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
       if (njcr->JobId != 0) {
@@ -238,8 +375,8 @@ char *bac_status(int stat)
       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;
 }