diff options
| author | Ted Ross <tross@apache.org> | 2010-05-25 14:02:49 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2010-05-25 14:02:49 +0000 |
| commit | 20def4fc6769f8ade4cf5b341c40249745ff95e2 (patch) | |
| tree | 11fcc54c98ba911cd9d9dd933244cb9d9626b5d5 /cpp/src/qpid/agent | |
| parent | 708b53fae2a61e608d4f7329c4ae81a7a0556dc5 (diff) | |
| download | qpid-python-20def4fc6769f8ade4cf5b341c40249745ff95e2.tar.gz | |
Replaced the earlier-removed init function (in ManagementAgent.h) that uses
ConnectionSettings. Created a ConnectionSettings in the qpid::management name
space that mirrors that from the qpid::client namespace.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@948046 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/agent')
| -rw-r--r-- | cpp/src/qpid/agent/ManagementAgentImpl.cpp | 25 | ||||
| -rw-r--r-- | cpp/src/qpid/agent/ManagementAgentImpl.h | 2 |
2 files changed, 23 insertions, 4 deletions
diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/cpp/src/qpid/agent/ManagementAgentImpl.cpp index 5c2c6c54e6..6a07d8c0e7 100644 --- a/cpp/src/qpid/agent/ManagementAgentImpl.cpp +++ b/cpp/src/qpid/agent/ManagementAgentImpl.cpp @@ -148,7 +148,7 @@ void ManagementAgentImpl::init(const string& brokerHost, const string& mech, const string& proto) { - client::ConnectionSettings settings; + management::ConnectionSettings settings; settings.protocol = proto; settings.host = brokerHost; settings.port = brokerPort; @@ -158,7 +158,7 @@ void ManagementAgentImpl::init(const string& brokerHost, init(settings, intervalSeconds, useExternalThread, _storeFile); } -void ManagementAgentImpl::init(const qpid::client::ConnectionSettings& settings, +void ManagementAgentImpl::init(const qpid::management::ConnectionSettings& settings, uint16_t intervalSeconds, bool useExternalThread, const string& _storeFile) @@ -170,7 +170,26 @@ void ManagementAgentImpl::init(const qpid::client::ConnectionSettings& settings, QPID_LOG(info, "QMF Agent Initialized: broker=" << settings.host << ":" << settings.port << " interval=" << intervalSeconds << " storeFile=" << _storeFile); - connectionSettings = settings; + + // + // Convert from management::ConnectionSettings to client::ConnectionSettings + // + connectionSettings.protocol = settings.protocol; + connectionSettings.host = settings.host; + connectionSettings.port = settings.port; + connectionSettings.virtualhost = settings.virtualhost; + connectionSettings.username = settings.username; + connectionSettings.password = settings.password; + connectionSettings.mechanism = settings.mechanism; + connectionSettings.locale = settings.locale; + connectionSettings.heartbeat = settings.heartbeat; + connectionSettings.maxChannels = settings.maxChannels; + connectionSettings.maxFrameSize = settings.maxFrameSize; + connectionSettings.bounds = settings.bounds; + connectionSettings.tcpNoDelay = settings.tcpNoDelay; + connectionSettings.service = settings.service; + connectionSettings.minSsf = settings.minSsf; + connectionSettings.maxSsf = settings.maxSsf; retrieveData(); bootSequence++; diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.h b/cpp/src/qpid/agent/ManagementAgentImpl.h index d1609341be..7d4531f1b8 100644 --- a/cpp/src/qpid/agent/ManagementAgentImpl.h +++ b/cpp/src/qpid/agent/ManagementAgentImpl.h @@ -63,7 +63,7 @@ class ManagementAgentImpl : public ManagementAgent, public client::MessageListen const std::string& pwd = "guest", const std::string& mech = "PLAIN", const std::string& proto = "tcp"); - void init(const client::ConnectionSettings& settings, + void init(const management::ConnectionSettings& settings, uint16_t intervalSeconds = 10, bool useExternalThread = false, const std::string& storeFile = ""); |