summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Anthony Giusti <kgiusti@apache.org>2010-04-06 15:24:33 +0000
committerKenneth Anthony Giusti <kgiusti@apache.org>2010-04-06 15:24:33 +0000
commitb8606dba4f8edc95bf5af7ace7090ca5f9f796b7 (patch)
treea98600bc38afcaad92b6f87f21a2ff9d1a3cb085
parent8fddccd7efb73cd25376f5492ddb09ad7fa09e3b (diff)
downloadqpid-python-b8606dba4f8edc95bf5af7ace7090ca5f9f796b7.tar.gz
verify broker UUID read from config file
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@931182 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/src/qpid/management/ManagementAgent.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp
index bc62588f5d..4158b685ce 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/cpp/src/qpid/management/ManagementAgent.cpp
@@ -150,7 +150,11 @@ void ManagementAgent::configure(const string& _dataDir, uint16_t _interval,
inFile >> bootSequence;
inFile >> nextRemoteBank;
inFile.close();
- QPID_LOG (debug, "ManagementAgent restored broker ID: " << uuid);
+ if (uuid.isNull()) {
+ uuid.generate();
+ QPID_LOG (info, "No stored broker ID found - ManagementAgent generated broker ID: " << uuid);
+ } else
+ QPID_LOG (debug, "ManagementAgent restored broker ID: " << uuid);
// if sequence goes beyond a 12-bit field, skip zero and wrap to 1.
bootSequence++;