From a5bc15007a80f2bdb80ddd0c87bf3690b5e53834 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 22 May 2012 18:11:07 +0000 Subject: QPID-3603: HA backups pass identifying info to primary. Pass hostname, management UUID and status in link connection arguments. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1341580 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/System.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'cpp/src/qpid/broker/System.cpp') diff --git a/cpp/src/qpid/broker/System.cpp b/cpp/src/qpid/broker/System.cpp index 8cd2edda76..fa8df6406b 100644 --- a/cpp/src/qpid/broker/System.cpp +++ b/cpp/src/qpid/broker/System.cpp @@ -37,7 +37,6 @@ System::System (string _dataDir, Broker* broker) : mgmtObject(0) if (agent != 0) { - framing::Uuid systemId; if (_dataDir.empty ()) { @@ -66,14 +65,13 @@ System::System (string _dataDir, Broker* broker) : mgmtObject(0) } mgmtObject = new _qmf::System(agent, this, types::Uuid(systemId.c_array())); - std::string sysname, nodename, release, version, machine; - qpid::sys::SystemInfo::getSystemId (sysname, - nodename, + qpid::sys::SystemInfo::getSystemId (osName, + nodeName, release, version, machine); - mgmtObject->set_osName (sysname); - mgmtObject->set_nodeName (nodename); + mgmtObject->set_osName (osName); + mgmtObject->set_nodeName (nodeName); mgmtObject->set_release (release); mgmtObject->set_version (version); mgmtObject->set_machine (machine); -- cgit v1.2.1