diff options
| author | Jose <jose@zeroc.com> | 2011-05-12 19:15:59 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2011-05-12 19:15:59 +0200 |
| commit | 41a33a0a600770ab9804b476f85338297d24c01d (patch) | |
| tree | 3efb459b16aca3401092065fc96f0935bb90d9c4 /cpp/src/IceStorm/TopicI.cpp | |
| parent | 5035 - iceboxnet ServiceManagerI throw wrong exception (diff) | |
| download | ice-41a33a0a600770ab9804b476f85338297d24c01d.tar.bz2 ice-41a33a0a600770ab9804b476f85338297d24c01d.tar.xz ice-41a33a0a600770ab9804b476f85338297d24c01d.zip | |
4846 - Include subscriber endpoints in IceStorm trace
Diffstat (limited to 'cpp/src/IceStorm/TopicI.cpp')
| -rw-r--r-- | cpp/src/IceStorm/TopicI.cpp | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index f5b17021af3..068f659bd66 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -15,6 +15,7 @@ #include <IceStorm/NodeI.h> #include <IceStorm/Observers.h> #include <IceStorm/DB.h> +#include <IceStorm/Util.h> #include <Ice/LoggerUtil.h> #include <algorithm> @@ -456,6 +457,10 @@ TopicImpl::TopicImpl( { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); out << _name << " recreate " << _instance->communicator()->identityToString(id); + if(traceLevels->topic > 1) + { + out << " endpoints: " << IceStormInternal::describeEndpoints(p->obj); + } } try @@ -470,7 +475,12 @@ TopicImpl::TopicImpl( catch(const Ice::Exception& ex) { Ice::Warning out(traceLevels->logger); - out << _name << " recreate " << _instance->communicator()->identityToString(id) << " failed: " << ex; + out << _name << " recreate " << _instance->communicator()->identityToString(id); + if(traceLevels->topic > 1) + { + out << " endpoints: " << IceStormInternal::describeEndpoints(p->obj); + } + out << " failed: " << ex; } } } @@ -571,9 +581,11 @@ TopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); out << _name << ": subscribe: " << _instance->communicator()->identityToString(id); + if(traceLevels->topic > 1) { - out << " QoS: "; + out << " endpoints: " << IceStormInternal::describeEndpoints(obj) + << " QoS: "; for(QoS::const_iterator p = qos.begin(); p != qos.end() ; ++p) { if(p != qos.begin()) @@ -735,9 +747,11 @@ TopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPrx& obj) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); out << _name << ": subscribeAndGetPublisher: " << _instance->communicator()->identityToString(id); + if(traceLevels->topic > 1) { - out << " QoS: "; + out << " endpoints: " << IceStormInternal::describeEndpoints(obj) + << " QoS: "; for(QoS::const_iterator p = qos.begin(); p != qos.end() ; ++p) { if(p != qos.begin()) @@ -829,8 +843,10 @@ TopicImpl::unsubscribe(const Ice::ObjectPrx& subscriber) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); out << _name << ": unsubscribe: " << _instance->communicator()->identityToString(id); + if(traceLevels->topic > 1) { + out << " endpoints: " << IceStormInternal::describeEndpoints(subscriber); trace(out, _instance, _subscribers); } } @@ -1259,9 +1275,11 @@ TopicImpl::observerAddSubscriber(const LogUpdate& llu, const SubscriberRecord& r { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); out << _name << ": add replica observer: " << _instance->communicator()->identityToString(record.id); + if(traceLevels->topic > 1) { - out << " QoS: "; + out << " endpoints: " << IceStormInternal::describeEndpoints(record.obj) + << " QoS: "; for(QoS::const_iterator p = record.theQoS.begin(); p != record.theQoS.end() ; ++p) { if(p != record.theQoS.begin()) |