From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 19 Dec 2022 15:32:00 +0000 (+0100)
Subject: Add connection message back in Copy/Migration job log
X-Git-Tag: Beta-15.0.0~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7acf0df16be117f0bf22a1219660b04453c90849;p=thirdparty%2Fbacula.git

Add connection message back in Copy/Migration job log
---

diff --git a/bacula/src/dird/mac.c b/bacula/src/dird/mac.c
index 66b387bde..c47c65dd6 100644
--- a/bacula/src/dird/mac.c
+++ b/bacula/src/dird/mac.c
@@ -386,7 +386,7 @@ bool do_mac(JCR *jcr)
    STORE *rstore = NULL;
    STORE *wstore = NULL;
    /* Keep original write storage source to set back during the cleanup */
-   POOL_MEM wsource_origin, rsource_origin;
+   POOL_MEM wsource_origin, rsource_origin, buf;
 
    /*
     * If wjcr is NULL, there is nothing to do for this job,
@@ -530,6 +530,14 @@ bool do_mac(JCR *jcr)
    }
    wsd = wjcr->store_bsock;
 
+   /* Print connection info only for real jobs */
+   build_connecting_info_log(_("Storage"), wjcr->store_mngr->get_wstore()->name(),
+                             get_storage_address(NULL, wjcr->store_mngr->get_wstore()),
+                             wjcr->store_mngr->get_wstore()->SDport,
+                             wjcr->store_bsock->tls ? true : false, buf.addr());
+   Jmsg(jcr, M_INFO, 0, "%s", buf.c_str());
+   
+   
    /* Send progress information for the Storage Daemon Job, will fill
     * information from "status dir"
     */
@@ -545,6 +553,13 @@ bool do_mac(JCR *jcr)
       goto bail_out;
    }
    sd = jcr->store_bsock;
+   
+   /* Print connection info only for real jobs */
+   build_connecting_info_log(_("Storage"), jcr->store_mngr->get_rstore()->name(),
+                             get_storage_address(NULL, jcr->store_mngr->get_rstore()),
+                             jcr->store_mngr->get_rstore()->SDport,
+                             jcr->store_bsock->tls ? true : false, buf.addr());
+   Jmsg(jcr, M_INFO, 0, "%s", buf.c_str());
 
    /* Send progress information for the Storage Daemon Job, will fill
     * information from "status dir"