Update doc

[bacula/bacula] / bacula / src / dird / ua_status.c

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 6d287c9d042cdd794b4894dfd308d0ff15971f17..77a7be2540cd619f3b00d372691fc89c64e57f40 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -85,7 +85,7 @@ int statuscmd(UAContext *ua, char *cmd)
       add_prompt(ua, _("Client"));
       add_prompt(ua, _("All"));
       Dmsg0(20, "do_prompt: select daemon\n");
-      if ((item=do_prompt(ua, _("Select daemon type for status"), cmd)) < 0) {
+      if ((item=do_prompt(ua, _("Select daemon type for status"), cmd, MAX_NAME_LENGTH)) < 0) {
         return 1;
       }
       Dmsg1(20, "item=%d\n", item);
@@ -203,23 +203,11 @@ static void do_director_status(UAContext *ua, char *cmd)
    bsendmsg(ua, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
         last_job.NumJobs == 1 ? "" : "s");
    if (last_job.NumJobs > 0) {
-      char *termstat, jstat[2];
+      char termstat[30];
 
       bstrftime(dt, sizeof(dt), last_job.end_time);
       bsendmsg(ua, _("Last Job %s finished at %s\n"), last_job.Job, dt);
-      switch (last_job.JobStatus) {
-        case JS_Terminated:
-            termstat = _("OK");
-           break;
-       case JS_ErrorTerminated:
-            termstat = _("Error");
-           break;
-       default:
-           jstat[0] = last_job.JobStatus;
-           jstat[1] = 0;
-           termstat = jstat;
-           break;
-      }
+      jobstatus_to_ascii(last_job.JobStatus, termstat, sizeof(termstat));
           
       bsendmsg(ua, _("  Files=%s Bytes=%s Termination Status=%s\n"), 
           edit_uint64_with_commas(last_job.JobFiles, b1),
@@ -327,7 +315,7 @@ static void do_storage_status(UAContext *ua, STORE *store)
    Dmsg0(20, _("Connected to storage daemon\n"));
    sd = ua->jcr->store_bsock;
    bnet_fsend(sd, "status");
-   while (bnet_recv(sd) > 0) {
+   while (bnet_recv(sd) >= 0) {
       bsendmsg(ua, "%s", sd->msg);
    }
    bnet_sig(sd, BNET_TERMINATE);
@@ -354,7 +342,7 @@ static void do_client_status(UAContext *ua, CLIENT *client)
    Dmsg0(20, _("Connected to file daemon\n"));
    fd = ua->jcr->file_bsock;
    bnet_fsend(fd, "status");
-   while (bnet_recv(fd) > 0) {
+   while (bnet_recv(fd) >= 0) {
       bsendmsg(ua, "%s", fd->msg);
    }
    bnet_sig(fd, BNET_TERMINATE);
@@ -364,26 +352,19 @@ static void do_client_status(UAContext *ua, CLIENT *client)
    return;  
 }
 
-static void prt_runtime(UAContext *ua, JOB *job, time_t runtime)
+static void prt_runhdr(UAContext *ua)
+{
+   bsendmsg(ua, _("Level          Type     Scheduled          Name\n"));
+   bsendmsg(ua, _("=================================================================\n"));
+}
+
+static void prt_runtime(UAContext *ua, JOB *job, int level, time_t runtime)
 {
-   char dt[MAX_TIME_LENGTH], *type;
+   char dt[MAX_TIME_LENGTH];      
 
    bstrftime(dt, sizeof(dt), runtime);
-   switch (job->JobType) {
-      case JT_BACKUP:
-         type = _("Backup");
-        break;
-      case JT_VERIFY:
-         type = _("Verify");
-        break;
-      case JT_RESTORE:
-         type = _("Restore");
-        break;
-      default:
-         type = _("Unknown type of");
-        break;
-   }
-   bsendmsg(ua, _("%s job \"%s\" scheduled for %s\n"), type, job->hdr.name, dt);
+   bsendmsg(ua, _("%-14s %-8s %-18s %s\n"), 
+      level_to_str(level), job_type_to_str(job->JobType), dt, job->hdr.name);
 }
 
 /*         
@@ -397,9 +378,11 @@ static void print_jobs_scheduled(UAContext *ua)
    JOB *job;
    SCHED *sched;
    struct tm tm;
-   int mday, wday, month, tmday, twday, tmonth, i, hour;
+   int mday, wday, month, wpos, tmday, twday, tmonth, twpos, i, hour;
    int tod, tom;
    int found;
+   int hdr_printed = FALSE;
+   int level;
 
    Dmsg0(200, "enter find_runs()\n");
 
@@ -408,29 +391,35 @@ static void print_jobs_scheduled(UAContext *ua)
    mday = tm.tm_mday - 1;
    wday = tm.tm_wday;
    month = tm.tm_mon;
+   wpos = (tm.tm_mday - 1) / 7;
 
    tomorrow = now + 60 * 60 * 24;
    localtime_r(&tomorrow, &tm);
    tmday = tm.tm_mday - 1;
    twday = tm.tm_wday;
    tmonth = tm.tm_mon;
+   twpos  = (tm.tm_mday - 1) / 7;
 
    /* Loop through all jobs */
    LockRes();
    for (job=NULL; (job=(JOB *)GetNextRes(R_JOB, (RES *)job)); ) {
+      level = job->level;   
       sched = job->schedule;
       if (sched == NULL) {           /* scheduled? */
         continue;                    /* no, skip this job */
       }
       for (run=sched->run; run; run=run->next) {
+        if (run->level) {
+           level = run->level;
+        }
         /* 
          * Find runs in next 24 hours
          */
         tod = (bit_is_set(mday, run->mday) || bit_is_set(wday, run->wday)) && 
-               bit_is_set(month, run->month);
+               bit_is_set(month, run->month) && bit_is_set(wpos, run->wpos);
 
         tom = (bit_is_set(tmday, run->mday) || bit_is_set(twday, run->wday)) &&
-               bit_is_set(tmonth, run->month);
+               bit_is_set(tmonth, run->month) && bit_is_set(wpos, run->wpos);
 
          Dmsg2(200, "tod=%d tom=%d\n", tod, tom);
         found = FALSE;
@@ -445,7 +434,11 @@ static void print_jobs_scheduled(UAContext *ua)
                  tm.tm_sec = 0;
                  runtime = mktime(&tm);
                  if (runtime > now) {
-                    prt_runtime(ua, job, runtime);
+                    if (!hdr_printed) {
+                       hdr_printed = TRUE;
+                       prt_runhdr(ua);
+                    }
+                    prt_runtime(ua, job, level, runtime);
                     found = TRUE;
                     break;
                  }
@@ -453,7 +446,7 @@ static void print_jobs_scheduled(UAContext *ua)
            }
         }
 
-        Dmsg2(200, "runtime=%d now=%d\n", runtime, now);
+//      Dmsg2(200, "runtime=%d now=%d\n", runtime, now);
        if (!found && tom) {
            localtime_r(&tomorrow, &tm);
            hour = 0;
@@ -469,7 +462,11 @@ static void print_jobs_scheduled(UAContext *ua)
            runtime = mktime(&tm);
             Dmsg2(200, "truntime=%d now=%d\n", runtime, now);
            if (runtime < tomorrow) {
-              prt_runtime(ua, job, runtime);
+              if (!hdr_printed) {
+                 hdr_printed = TRUE;
+                 prt_runhdr(ua);
+              }
+              prt_runtime(ua, job, level, runtime);
            }
         }
       }