Fixed issues in configuration related to missing params
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3360d540 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3360d540 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3360d540 Branch: refs/heads/master Commit: 3360d54031069ef5eb9d730a74c3d1f239d9eba6 Parents: 98396a7 Author: Chamila de Alwis <[email protected]> Authored: Sat Oct 11 22:03:42 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Sat Oct 11 22:03:42 2014 +0530 ---------------------------------------------------------------------- .../modules/extensions/defaultextensionhandler.py | 5 +++-- .../modules/publisher/cartridgeagentpublisher.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/3360d540/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py b/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py index f2ec818..f0b9987 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py @@ -178,8 +178,9 @@ class DefaultExtensionHandler(AbstractExtensionHandler): clustered = self.cartridge_agent_config.is_clustered - if member.properties is not None and member.properties[ - cartridgeagentconstants.CLUSTERING_PRIMARY_KEY] == "true" and clustered is not None and clustered: + if member.properties is not None and cartridgeagentconstants.CLUSTERING_PRIMARY_KEY in member.properties \ + and member.properties[cartridgeagentconstants.CLUSTERING_PRIMARY_KEY] == "true" \ + and clustered is not None and clustered: self.log.debug(" If WK member is re-spawned, update axis2.xml ") http://git-wip-us.apache.org/repos/asf/stratos/blob/3360d540/tools/python-cartridge-agent/cartridge-agent/modules/publisher/cartridgeagentpublisher.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/publisher/cartridgeagentpublisher.py b/tools/python-cartridge-agent/cartridge-agent/modules/publisher/cartridgeagentpublisher.py index 89321b4..59401b5 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/publisher/cartridgeagentpublisher.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/publisher/cartridgeagentpublisher.py @@ -77,7 +77,7 @@ def publish_instance_activated_event(): if CEPPublisherConfiguration.get_instance().enabled: interval_default = 15 # seconds - interval = CartridgeAgentConfiguration().read_property("stats.notifier.interval") + interval = CartridgeAgentConfiguration().read_property("stats.notifier.interval", False) if interval is not None and len(interval) > 0: try: interval = int(interval)
