Repository: stratos Updated Branches: refs/heads/master 78cd52ff6 -> 1dc3b27ef
[STRATOS-940] - Python Agent does not publish health stats upon a restart in Stratos - Catch the read and write exceptions from the socket and continue without crashing Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a1314685 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a1314685 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a1314685 Branch: refs/heads/master Commit: a13146852417e70fa18101660cb78791a2ca20ac Parents: 95422e9 Author: Chamila de Alwis <[email protected]> Authored: Wed Nov 12 15:05:46 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Wed Nov 12 15:05:46 2014 +0530 ---------------------------------------------------------------------- .../cartridgeagent/cartridgeagent/modules/databridge/agent.py | 2 ++ .../cartridgeagent/modules/publisher/cartridgeagentpublisher.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a1314685/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/databridge/agent.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/databridge/agent.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/databridge/agent.py index 96762f2..0de3086 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/databridge/agent.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/databridge/agent.py @@ -167,6 +167,8 @@ class ThriftPublisher: self.log.debug("connected! stream ID: %r" % self.stream_id) self.publish(event) + except Exception as ex: + self.log.error("Couldn't publish event. Connection to CEP receiver dropped.") self.log.debug("Published event to thrift stream [%r]" % self.stream_id) http://git-wip-us.apache.org/repos/asf/stratos/blob/a1314685/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py index 1ce8ffb..b218fbe 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py @@ -87,7 +87,7 @@ def publish_instance_activated_event(): interval = interval_default health_stats_publisher = HealthStatisticsPublisherManager(interval) - log.info("Starting Health statistics publisher with interval %r" % interval_default) + log.info("Starting Health statistics publisher with interval %r" % interval) health_stats_publisher.start() else: log.warn("Statistics publisher is disabled")
