Allow duplicate job check override from run cmdline for migrate and copy jobs.

[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 889cbb20158518a8038fe0700b8fa3fb5fed9c7f..26f03e51aa03335741e9a484468c441792897fbf 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -6,7 +6,7 @@
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or

-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public

    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 


@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 

-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License

    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.


@@ -295,13 +295,8 @@ void list_dir_status_header(UAContext *ua)
    ua->send_msg(_("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE,
             HOST_OS, DISTNAME, DISTVER);
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
    ua->send_msg(_("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE,
             HOST_OS, DISTNAME, DISTVER);
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);

-   if (num_jobs_run == 1) {
-      ua->send_msg(_("Daemon started %s, 1 Job run since started.\n"), dt);
-   }
-   else {
-      ua->send_msg(_("Daemon started %s, %d Jobs run since started.\n"),
-        dt, num_jobs_run);
-   }
+   ua->send_msg(_("Daemon started %s. Jobs: run=%d, running=%d\n"), dt,
+                   num_jobs_run, job_count());

    ua->send_msg(_(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
             edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1),
             edit_uint64_with_commas(sm_bytes, b2),
    ua->send_msg(_(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
             edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1),
             edit_uint64_with_commas(sm_bytes, b2),


@@ -457,7 +452,7 @@ static void prt_runtime(UAContext *ua, sched_pkt *sp)
    MEDIA_DBR mr;
    int orig_jobtype;
 
    MEDIA_DBR mr;
    int orig_jobtype;
 

-   orig_jobtype = jcr->get_JobType();
+   orig_jobtype = jcr->getJobType();

    memset(&mr, 0, sizeof(mr));
    if (sp->job->JobType == JT_BACKUP) {
       jcr->db = NULL;
    memset(&mr, 0, sizeof(mr));
    if (sp->job->JobType == JT_BACKUP) {
       jcr->db = NULL;


@@ -501,7 +496,7 @@ static void prt_runtime(UAContext *ua, sched_pkt *sp)
       db_close_database(jcr, jcr->db);
    }
    jcr->db = ua->db;                  /* restore ua db to jcr */
       db_close_database(jcr, jcr->db);
    }
    jcr->db = ua->db;                  /* restore ua db to jcr */

-   jcr->set_JobType(orig_jobtype);
+   jcr->setJobType(orig_jobtype);

 }
 
 /*
 }
 
 /*


@@ -613,7 +608,7 @@ static void list_running_jobs(UAContext *ua)
          /* this is a console or other control job. We only show console
           * jobs in the status output.
           */
          /* this is a console or other control job. We only show console
           * jobs in the status output.
           */

-         if (jcr->get_JobType() == JT_CONSOLE && !ua->api) {
+         if (jcr->getJobType() == JT_CONSOLE && !ua->api) {

             bstrftime_nc(dt, sizeof(dt), jcr->start_time);
             ua->send_msg(_("Console connected at %s\n"), dt);
          }
             bstrftime_nc(dt, sizeof(dt), jcr->start_time);
             ua->send_msg(_("Console connected at %s\n"), dt);
          }


@@ -683,9 +678,9 @@ static void list_running_jobs(UAContext *ua)
       case JS_WaitSD:
          emsg = (char *) get_pool_memory(PM_FNAME);
          if (jcr->wstore) {
       case JS_WaitSD:
          emsg = (char *) get_pool_memory(PM_FNAME);
          if (jcr->wstore) {

-            Mmsg(emsg, _("is waiting on Storage %s"), jcr->wstore->name());
+            Mmsg(emsg, _("is waiting on Storage \"%s\""), jcr->wstore->name());

          } else if (jcr->rstore) {
          } else if (jcr->rstore) {

-            Mmsg(emsg, _("is waiting on Storage %s"), jcr->rstore->name());
+            Mmsg(emsg, _("is waiting on Storage \"%s\""), jcr->rstore->name());

          } else {
             Mmsg(emsg, _("is waiting on Storage"));
          }
          } else {
             Mmsg(emsg, _("is waiting on Storage"));
          }


@@ -774,23 +769,29 @@ static void list_running_jobs(UAContext *ua)
          msg = _("Dir inserting Attributes");
          break;
       }
          msg = _("Dir inserting Attributes");
          break;
       }

-      switch (jcr->get_JobType()) {
+      switch (jcr->getJobType()) {

       case JT_ADMIN:
       case JT_RESTORE:
          bstrncpy(level, "      ", sizeof(level));
          break;
       default:
       case JT_ADMIN:
       case JT_RESTORE:
          bstrncpy(level, "      ", sizeof(level));
          break;
       default:

-         bstrncpy(level, level_to_str(jcr->get_JobLevel()), sizeof(level));
+         bstrncpy(level, level_to_str(jcr->getJobLevel()), sizeof(level));

          level[7] = 0;
          break;
       }
 
       if (ua->api) {
          level[7] = 0;
          break;
       }
 
       if (ua->api) {

-         ua->send_msg(_("%6d\t%-6s\t%-20s\t%s\n"),
-            jcr->JobId, level, jcr->Job, msg);
+         bash_spaces(jcr->comment);
+         ua->send_msg(_("%6d\t%-6s\t%-20s\t%s\t%s\n"),
+                      jcr->JobId, level, jcr->Job, msg, jcr->comment);
+         unbash_spaces(jcr->comment);

       } else {
          ua->send_msg(_("%6d %-6s  %-20s %s\n"),
             jcr->JobId, level, jcr->Job, msg);
       } else {
          ua->send_msg(_("%6d %-6s  %-20s %s\n"),
             jcr->JobId, level, jcr->Job, msg);

+         /* Display comments if any */
+         if (*jcr->comment) {
+            ua->send_msg(_("               %-30s\n"), jcr->comment);
+         }

       }
 
       if (pool_mem) {
       }
 
       if (pool_mem) {