Added wx-console.exe and .conf.

[bacula/bacula] / bacula / src / filed / status.c

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index a13f6bc02a5b6053438ba02bd971ac185b2e3254..5393df16a1f0916bd72458111ea2943dcdf6e883 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -30,7 +30,7 @@
 #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 */
@@ -60,8 +60,8 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
              HOST_OS, DISTNAME, DISTVER);
    sendit(msg, len, arg);
    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");
+   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 (debug_level > 0) {
@@ -83,31 +83,14 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
 
    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);
-
-        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 running jobs  
     */
    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)); ) {
+   foreach_jcr(njcr) {
       bstrftime_nc(dt, sizeof(dt), njcr->start_time);
       if (njcr->JobId == 0) {
          len = Mmsg(&msg, _("Director connected at: %s\n"), dt);
@@ -127,7 +110,7 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
       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),
@@ -157,9 +140,11 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
    unlock_jcr_chain();
    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);
 }
 
@@ -170,7 +155,7 @@ static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sa
    struct s_last_job *je;
    const char *msg;
 
-   if (last_job.NumJobs == 0) {
+   if (last_jobs->size() == 0) {
       msg = _("No Terminated Jobs.\n"); 
       sendit(msg, strlen(msg), arg);
       return;
@@ -183,7 +168,7 @@ static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sa
    sendit(msg, strlen(msg), arg);
    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];
@@ -228,7 +213,7 @@ static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sa
            *p = 0;
         }
       }
-      bsnprintf(buf, sizeof(buf), _("%6d  %-4s %8s %14s %-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),
@@ -237,7 +222,7 @@ static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sa
         dt, JobName);
       sendit(buf, strlen(buf), arg);
    }
-   sendit("\n", 1, arg);
+   sendit("====\n", 5, arg);
    unlock_last_jobs_list();
 }
 
@@ -264,7 +249,6 @@ int status_cmd(JCR *jcr)
 
    bnet_fsend(user, "\n");
    do_status(bsock_sendit, (void *)user);
-   bnet_fsend(user, "====\n");
 
    bnet_sig(user, BNET_EOD);
    return 1;
@@ -366,10 +350,15 @@ char *bac_status(int stat)
 {
    JCR *njcr;
    char *termstat = _("Bacula Idle");
+   struct s_last_job *job;
 
    bacstat = 0;
-   if (last_job.NumJobs > 0) {
-      switch (last_job.JobStatus) {
+   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");
@@ -384,7 +373,7 @@ char *bac_status(int stat)
    }
    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");