Fix #5240 About 'status client/storage' showing maxConcJobs

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 03596bcbc2eccc11b5752882fc95545082372937..08c23807df42e94fc40dd53078a5a939884add96 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -482,8 +482,8 @@ void list_dir_status_header(UAContext *ua)
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
    bstrftimes(dt1, sizeof(dt1), last_reload_time);
    ua->send_msg(_("Daemon started %s, conf reloaded %s\n"), dt, dt1);
-   ua->send_msg(_(" Jobs: run=%d, running=%d mode=%d,%d\n"),
-                num_jobs_run, job_count(), (int)DEVELOPER_MODE, (int)BEEF);
+   ua->send_msg(_(" Jobs: run=%d, running=%d max=%ld mode=%d,%d\n"),
+                num_jobs_run, job_count(), director->MaxConcurrentJobs, (int)DEVELOPER_MODE, (int)BEEF);
    
 /* TODO
    int64_t nofile_l = 1000 + 5 * director->MaxConcurrentJobs;

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 317ea923a832b61efb385b0a0240f19c978ba4a4..a2a56b9d1babba61955ff581e57940df2f9899d3 100644 (file)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -142,13 +142,17 @@ static void  list_status_header(STATUS_PKT *sp)
       return;
    }
 
+   LockRes();
+   CLIENT *client = (CLIENT *)GetNextRes(R_CLIENT, NULL);
+   UnlockRes();
+
    len = Mmsg(msg, _("%s %sVersion: %s (%s) %s %s %s %s\n"),
               my_name, BDEMO, VERSION, BDATE, VSS, HOST_OS,
               DISTNAME, DISTVER);
    sendit(msg.c_str(), len, sp);
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
-   len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d.\n"),
-        dt, num_jobs_run, job_count());
+   len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d max=%ld.\n"),
+        dt, num_jobs_run, job_count(), client->MaxConcurrentJobs);
    sendit(msg.c_str(), len, sp);
 #if defined(HAVE_WIN32)
    char buf[300];

diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index 960b7edc837a7a4030c1002fecc38bbf181f154b..78ec0d31348ca1897ca493acbe0c54713832a8c5 100644 (file)
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -609,9 +609,12 @@ static void list_status_header(STATUS_PKT *sp)
 
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
 
+   LockRes();
+   STORES *store = (STORES *)GetNextRes(R_STORAGE, NULL);
+   UnlockRes();
 
-   len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d, running=%d.\n"),
-        dt, num_jobs_run, job_count());
+   len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d, running=%d max=%ld.\n"),
+        dt, num_jobs_run, job_count(), store->max_concurrent_jobs);
    sendit(msg, len, sp);
 
    int64_t nofile_l = 1000 + 5 * me->max_concurrent_jobs;