diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2006-11-17 01:56:50 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2006-11-17 01:56:50 +0000 |
| commit | 524c9b7a807e2dffce0c0043ad02dbb2cc14fb3c (patch) | |
| tree | 0fb2b9ad75174be1831b65e75a92576514091f0e /cpp/src | |
| parent | Added ? option (diff) | |
| download | ice-524c9b7a807e2dffce0c0043ad02dbb2cc14fb3c.tar.bz2 ice-524c9b7a807e2dffce0c0043ad02dbb2cc14fb3c.tar.xz ice-524c9b7a807e2dffce0c0043ad02dbb2cc14fb3c.zip | |
more IceStorm cleanup.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceStorm/IceStormInternal.ice | 18 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Subscriber.cpp | 53 |
2 files changed, 26 insertions, 45 deletions
diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice index c98d13e0356..96d1f0e3b00 100644 --- a/cpp/src/IceStorm/IceStormInternal.ice +++ b/cpp/src/IceStorm/IceStormInternal.ice @@ -38,24 +38,6 @@ interface TopicLink /** * - * The TopicUpstreamLink interface. This is used to inform an unstream - * topic that a federated downstream topic is alive. - * - * @see TopicInternal - * - **/ -interface TopicUpstreamLink -{ - /** - * - * Inform the upstream topic that a federated downstream topic is alive. - * - **/ - void keepAlive(); -}; - -/** - * * Internal operations for a topic. * * @see Topic diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp index 000f7cbfd5e..844f9902b10 100644 --- a/cpp/src/IceStorm/Subscriber.cpp +++ b/cpp/src/IceStorm/Subscriber.cpp @@ -283,7 +283,7 @@ SubscriberOneway::flush() if(!_events.empty()) { - _state = SubscriberStateFlushPending; + assert(_state == SubscriberStateFlushPending); return true; } _state = SubscriberStateOnline; @@ -383,7 +383,7 @@ SubscriberTwoway::flush() // if(!_events.empty()) { - _state = SubscriberStateFlushPending; + assert(_state == SubscriberStateFlushPending); return true; } _state = SubscriberStateOnline; @@ -659,35 +659,34 @@ void SubscriberLink::offline(const Ice::Exception& e) { IceUtil::Mutex::Lock sync(_mutex); - if(_state != SubscriberStateOffline) + assert(_state != SubscriberStateOffline); + + _next = IceUtil::Time::now() + _instance->discardInterval(); + + TraceLevelsPtr traceLevels = _instance->traceLevels(); + if(_warn) { - _next = IceUtil::Time::now() + _instance->discardInterval(); - - TraceLevelsPtr traceLevels = _instance->traceLevels(); - if(_warn) - { - Ice::Warning warn(traceLevels->logger); - warn << traceLevels->subscriberCat << ":" << _instance->communicator()->identityToString(_id) - << ": link offline: " << e; - } - else + Ice::Warning warn(traceLevels->logger); + warn << traceLevels->subscriberCat << ":" << _instance->communicator()->identityToString(_id) + << ": link offline: " << e; + } + else + { + if(traceLevels->subscriber > 0) { - if(traceLevels->subscriber > 0) - { - Ice::Trace out(traceLevels->logger, traceLevels->subscriberCat); - out << _instance->communicator()->identityToString(_id) << ": link offline: " << e - << " discarding events: " << _instance->discardInterval() << "s"; - } + Ice::Trace out(traceLevels->logger, traceLevels->subscriberCat); + out << _instance->communicator()->identityToString(_id) << ": link offline: " << e + << " discarding events: " << _instance->discardInterval() << "s"; } - - _state = SubscriberStateOffline; - _warn = false; - - // - // Clear all queued events. - // - _events.clear(); } + + _state = SubscriberStateOffline; + _warn = false; + + // + // Clear all queued events. + // + _events.clear(); } SubscriberPtr |