From 1ec9635b9cccfe08d9c44649eb8f4891d44f4404 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 26 Sep 2007 12:55:53 +0000 Subject: [PATCH] Add JobId to all Dmsg() output. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5653 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/lib/message.c | 3 ++- bacula/src/stored/authenticate.c | 4 ++-- bacula/technotes-2.3 | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c index 70073f6355..b231e62298 100644 --- 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 2d46b399d9..0b6ad505a1 100644 --- 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 edc47ee22b..446df2df65 100644 --- 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. -- 2.39.5