Add JobId to all Dmsg() output.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5653 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 70073f63555b8a3e7a1100e95129f6eed27e5f34..b231e62298a11e05265883793059472dcf587041 100644 (file)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -849,7 +849,8 @@ d_msg(const char *file, int line, int level, const char *fmt,...)
     if (level <= debug_level) {
 #ifdef FULL_LOCATION
        if (details) {
-          len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, get_basename(file), line);
+          len = bsnprintf(buf, sizeof(buf), "%s: %s:%d jid=%u", 
+                my_name, get_basename(file), line, get_jobid_from_tid());
        } else {
           len = 0;
        }

diff --git a/bacula/src/stored/authenticate.c b/bacula/src/stored/authenticate.c
index 2d46b399d9983082ee8b3654657f9aa462470d6d..0b6ad505a1ba2517be3cb42c02374ede781b880e 100644 (file)
--- a/bacula/src/stored/authenticate.c
+++ b/bacula/src/stored/authenticate.c
@@ -177,13 +177,13 @@ int authenticate_director(JCR *jcr)
    BSOCK *dir = jcr->dir_bsock;
 
    if (!authenticate(R_DIRECTOR, dir, jcr)) {
-      bnet_fsend(dir, "%s", Dir_sorry);
+      dir->fsend("%s", Dir_sorry);
       Dmsg1(dbglvl, "Unable to authenticate Director at %s.\n", dir->who());
       Emsg1(M_ERROR, 0, _("Unable to authenticate Director at %s.\n"), dir->who());
       bmicrosleep(5, 0);
       return 0;
    }
-   return bnet_fsend(dir, "%s", OK_hello);
+   return dir->fsend("%s", OK_hello);
 }
 
 int authenticate_filed(JCR *jcr)

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index edc47ee22b69038316ab40e6db2667a8d94f64fb..446df2df6546ee68074fcc8f87812da7dfb302a5 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,7 @@
 
 General:
 26Sep07
+kes  Add JobId to all Dmsg() output.
 kes  Put some FD auth code on dbglvl rather than fixed.
 kes  Return insert attributes error message in db msg buffer to avoid
      false error messages.