diff options
| author | Alan Conway <aconway@apache.org> | 2012-05-22 18:11:07 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-05-22 18:11:07 +0000 |
| commit | a5bc15007a80f2bdb80ddd0c87bf3690b5e53834 (patch) | |
| tree | c63da143dd7c32cff6f312ef44c827ad969e211f /cpp/src/qpid/broker/System.cpp | |
| parent | 5bdd719384b66b3d576233c0a64db6b30690fac0 (diff) | |
| download | qpid-python-a5bc15007a80f2bdb80ddd0c87bf3690b5e53834.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/broker/System.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/System.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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); |