Cleanup new timeout code for bconsole

[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 bb49e4e2a2e4db8cb40a57b9275546c56270bcb4..bbcbb6d0038c6bfef43c2f5622efc67032a53b3b 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -307,6 +307,23 @@ void list_dir_status_header(UAContext *ua)
             edit_uint64_with_commas(sm_max_bytes, b3),
             edit_uint64_with_commas(sm_buffers, b4),
             edit_uint64_with_commas(sm_max_buffers, b5));
+
+   /* TODO: use this function once for all daemons */
+   if (debug_level > 0 && plugin_list->size() > 0) {
+      int len;
+      Plugin *plugin;
+      POOL_MEM msg(PM_FNAME);
+      pm_strcpy(msg, " Plugin: ");
+      foreach_alist(plugin, plugin_list) {
+         len = pm_strcat(msg, plugin->file);
+         if (len > 80) {
+            pm_strcat(msg, "\n   ");
+         } else {
+            pm_strcat(msg, " ");
+         }
+      }
+      ua->send_msg("%s\n", msg.c_str());
+   }
 }
 
 static void do_director_status(UAContext *ua)
@@ -424,7 +441,7 @@ struct sched_pkt {
    JOB *job;
    int level;
    int priority;
-   time_t runtime;
+   utime_t runtime;
    POOL *pool;
    STORE *store;
 };
@@ -453,6 +470,7 @@ static void prt_runtime(UAContext *ua, sched_pkt *sp)
          mr.StorageId = sp->store->StorageId;
          jcr->wstore = sp->store;
          Dmsg0(250, "call find_next_volume_for_append\n");
+         /* no need to set ScratchPoolId, since we use fnv_no_create_vol */
          ok = find_next_volume_for_append(jcr, &mr, 1, fnv_no_create_vol, fnv_no_prune);
       }
       if (!ok) {
@@ -511,7 +529,7 @@ static int my_compare(void *item1, void *item2)
  */
 static void list_scheduled_jobs(UAContext *ua)
 {
-   time_t runtime;
+   utime_t runtime;
    RUN *run;
    JOB *job;
    int level, num_jobs = 0;
@@ -633,6 +651,9 @@ static void list_running_jobs(UAContext *ua)
       case JS_Terminated:
          msg = _("has terminated");
          break;
+      case JS_Warnings:
+         msg = _("has terminated with warnings");
+         break;
       case JS_ErrorTerminated:
          msg = _("has erred");
          break;
@@ -842,6 +863,9 @@ static void list_terminated_jobs(UAContext *ua)
       case JS_Terminated:
          termstat = _("OK");
          break;
+      case JS_Warnings:
+         termstat = _("OK -- with warnings");
+         break;
       default:
          termstat = _("Other");
          break;