|
@@ -557,6 +557,9 @@ class EventListenerPool(ProcessGroupBase):
|
|
|
# rebuffer the event
|
|
|
self._bufferEvent(event.event)
|
|
|
|
|
|
+ def _trace(self, msg):
|
|
|
+ self.config.options.logger.log(self.config.options.TRACE, msg)
|
|
|
+
|
|
|
def transition(self):
|
|
|
self.kill_undead()
|
|
|
for proc in self.processes.values():
|
|
@@ -566,11 +569,14 @@ class EventListenerPool(ProcessGroupBase):
|
|
|
# order oldest (leftmost) to newest (rightmost) in list)
|
|
|
event = self.event_buffer.pop(0)
|
|
|
ok = self._dispatchEvent(event, buffer=False)
|
|
|
- if not ok:
|
|
|
- self.config.options.logger.log(
|
|
|
- self.config.options.TRACE,
|
|
|
- 'Failed sending buffered event %s (bufsize %s)' % (
|
|
|
- event.serial, len(self.event_buffer)))
|
|
|
+ if ok:
|
|
|
+ self._trace(
|
|
|
+ '%s: Succeeded sending buffered event %s (bufsize %s)' % (
|
|
|
+ self.config.name, event.serial, len(self.event_buffer)))
|
|
|
+ else:
|
|
|
+ self._trace(
|
|
|
+ '%s: Failed sending buffered event %s (bufsize %s)' % (
|
|
|
+ self.config.name, event.serial, len(self.event_buffer)))
|
|
|
self.event_buffer.insert(0, event)
|
|
|
|
|
|
def _eventEnvelope(self, event_type, serial, payload):
|
|
@@ -593,9 +599,8 @@ class EventListenerPool(ProcessGroupBase):
|
|
|
self.config.options.logger.info(
|
|
|
'pool %s event buffer overflowed, discarding event %s' % (
|
|
|
(self.config.name, discarded_event.serial)))
|
|
|
- self.config.options.logger.log(self.config.options.TRACE,
|
|
|
- 'pool %s busy, buffering event %s' % (
|
|
|
- (self.config.name, event.serial)))
|
|
|
+ self._trace('pool %s busy, buffering event %s' % ((self.config.name,
|
|
|
+ event.serial)))
|
|
|
self.event_buffer.append(event)
|
|
|
|
|
|
def _dispatchEvent(self, event, buffer=True):
|
|
@@ -619,9 +624,7 @@ class EventListenerPool(ProcessGroupBase):
|
|
|
|
|
|
process.listener_state = EventListenerStates.BUSY
|
|
|
process.event = event
|
|
|
- self.config.options.logger.log(
|
|
|
- self.config.options.TRACE,
|
|
|
- 'event %s sent to listener %s' % (
|
|
|
+ self._trace('event %s sent to listener %s' % (
|
|
|
event.serial, process.config.name))
|
|
|
return True
|
|
|
if buffer:
|