Ensure that StorageId is updated after write

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

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index a7371e354a5797281d29942fef2297fa2762dc2f..67000981ded688570796ceb6829b55878736b845 100644 (file)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -146,15 +146,15 @@ static void  list_status_header(STATUS_PKT *sp)
          edit_uint64_with_commas(sm_buffers, b4),
          edit_uint64_with_commas(sm_max_buffers, b5));
    sendit(msg.c_str(), len, sp);
-   len = Mmsg(msg, _(" Sizeof: boffset_t=%d size_t=%d debug=%d trace=%d "
-                     "bwlimit=%lldkB/s\n"), sizeof(boffset_t), sizeof(size_t),
-              debug_level, get_trace(), me->max_bandwidth_per_job/1024);
+   len = Mmsg(msg, _(" Sizeof: boffset_t=%d size_t=%d debug=%d trace=%d "),
+                   sizeof(boffset_t), sizeof(size_t),
+              debug_level, get_trace());
    sendit(msg.c_str(), len, sp);
-   if (debug_level > 0 && plugin_list->size() > 0) {
+   if (debug_level > 0 && bplugin_list->size() > 0) {
       Plugin *plugin;
       int len;
       pm_strcpy(msg, "Plugin: ");
-      foreach_alist(plugin, plugin_list) {
+      foreach_alist(plugin, bplugin_list) {
          len = pm_strcat(msg, plugin->file);
          if (len > 80) {
             pm_strcat(msg, "\n   ");
@@ -250,7 +250,6 @@ static void  list_running_jobs_api(STATUS_PKT *sp)
    POOL_MEM msg(PM_MESSAGE);
    char b1[32], b2[32], b3[32];
    int len;
-   bool found = false;
    JCR *njcr;
    char dt[MAX_TIME_LENGTH];
    /*
@@ -283,12 +282,11 @@ static void  list_running_jobs_api(STATUS_PKT *sp)
          sec = 1;
       }
       bps = (int)(njcr->JobBytes / sec);
-      len = Mmsg(msg, " Files=%s\n Bytes=%s\n Bytes/sec=%s\n Errors=%d\n"
-                 " Bwlimit=%d\n",
+      len = Mmsg(msg, " Files=%s\n Bytes=%s\n Bytes/sec=%s\n Errors=%d\n",
                  edit_uint64(njcr->JobFiles, b1),
                  edit_uint64(njcr->JobBytes, b2),
                  edit_uint64(bps, b3),
-                 njcr->JobErrors, njcr->max_bandwidth);
+                 njcr->JobErrors);
       sendit(msg.c_str(), len, sp);
       len = Mmsg(msg, " Files Examined=%s\n",
            edit_uint64(njcr->num_files_examined, b1));
@@ -300,7 +298,6 @@ static void  list_running_jobs_api(STATUS_PKT *sp)
          sendit(msg.c_str(), len, sp);
       }
 
-      found = true;
       if (njcr->store_bsock) {
          len = Mmsg(msg, " SDReadSeqNo=%" lld "\n fd=%d\n",
              njcr->store_bsock->read_seqno, njcr->store_bsock->m_fd);