Tweak messages

diff --git a/bacula/src/dird/mac.c b/bacula/src/dird/mac.c
index ae85245363cd13b62295ca67a18465ad9f4fce1c..1cbf7d1798d248742bec491ad5b286deb51a1814 100644 (file)
--- 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 17307613f4e4b9668b9a35a14c0abd53cfd9d7c1..fb6f62e256fd149962af60985b561ae2260d27d0 100644 (file)
--- 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)) {