From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 14 Jun 2021 06:50:27 +0000 (+0200)
Subject: Tweak messages
X-Git-Tag: Release-11.3.2~491
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b981ffee7378cb07de3a1ab11c013a1ded4b928;p=thirdparty%2Fbacula.git

Tweak messages
---

diff --git a/bacula/src/dird/mac.c b/bacula/src/dird/mac.c
index ae8524536..1cbf7d179 100644
--- a/bacula/src/dird/mac.c
+++ b/bacula/src/dird/mac.c
@@ -441,7 +441,7 @@ bool do_mac(JCR *jcr)
     */
    Dmsg0(200, "Connect to write (wjcr) storage daemon.\n");
    if (!connect_to_storage_daemon(wjcr, 10, SDConnectTimeout, 1)) {
-      Jmsg(jcr, M_FATAL, 0, _("Could not connect to write Storage Daemon: %s\n"), wjcr->store_mngr->get_wstore()->name());
+      Jmsg(jcr, M_FATAL, 0, _("Could not connect to write Storage Daemon \"%s\"\n"), wjcr->store_mngr->get_wstore()->name());
       goto bail_out;
    }
    wsd = wjcr->store_bsock;
@@ -451,7 +451,7 @@ bool do_mac(JCR *jcr)
     */
    Dmsg1(200, "Connect to read (jcr) storage daemon. Jid=%d\n", jcr->JobId);
    if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {
-      Jmsg(jcr, M_FATAL, 0, _("Could not connect to read Storage Daemon: %s\n"), jcr->store_mngr->get_rstore()->name());
+      Jmsg(jcr, M_FATAL, 0, _("Could not connect to read Storage Daemon \"%s\"\n"), jcr->store_mngr->get_rstore()->name());
       goto bail_out;
    }
    sd = jcr->store_bsock;
@@ -471,7 +471,7 @@ bool do_mac(JCR *jcr)
     */
    Dmsg1(200, "Start job with read (jcr) storage daemon. Jid=%d\n", jcr->JobId);
    if (!start_storage_daemon_job(jcr, jcr->store_mngr->get_rstore_list(), NULL, true /* wait */, /*send_bsr*/true)) {
-      Jmsg(jcr, M_FATAL, 0, _("Could not start job on read Storage Daemon: %s\n"), jcr->store_mngr->get_rstore()->name());
+      Jmsg(jcr, M_FATAL, 0, _("Could not start job on read Storage Daemon \"%s\"\n"), jcr->store_mngr->get_rstore()->name());
       goto bail_out;
    }
    Dmsg0(150, "Read storage daemon connection OK\n");
@@ -489,7 +489,7 @@ bool do_mac(JCR *jcr)
     */
    Dmsg1(200, "Start Job with write (wjcr) storage daemon. Jid=%d\n", jcr->JobId);
    if (!start_storage_daemon_job(wjcr, NULL, wjcr->store_mngr->get_wstore_list(), true /* wait */, /*no_send_bsr*/false)) {
-      Jmsg(jcr, M_FATAL, 0, _("Could not start job on write Storage Daemon: %s\n"), wjcr->store_mngr->get_wstore()->name());
+      Jmsg(jcr, M_FATAL, 0, _("Could not start job on write Storage Daemon \"%s\"\n"), wjcr->store_mngr->get_wstore()->name());
       goto bail_out;
    }
    Dmsg0(150, "Write storage daemon connection OK\n");
diff --git a/bacula/src/dird/msgchan.c b/bacula/src/dird/msgchan.c
index 17307613f..fb6f62e25 100644
--- a/bacula/src/dird/msgchan.c
+++ b/bacula/src/dird/msgchan.c
@@ -130,7 +130,7 @@ bool connect_to_storage_daemon(JCR *jcr, int retry_interval,
       store->SDport);
    sd->set_source_address(director->DIRsrc_addr);
    //TODO is translating needed/useful here?
-   Mmsg(buf, _("Storage Daemon: %s"), store->name());
+   Mmsg(buf, _("Storage Daemon \"%s\""), store->name());
    if (!sd->connect(jcr, retry_interval, max_retry_time, heart_beat, buf.c_str(),
          store->address, NULL, store->SDport, verbose)) {