Repository: stratos Updated Branches: refs/heads/master 2363c84f7 -> 2de14cd3e
Fixing cartridge agent config initialization logic which wait until member initialized event Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2de14cd3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2de14cd3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2de14cd3 Branch: refs/heads/master Commit: 2de14cd3e982d91f405689178c6eebc1bd8618a5 Parents: 2363c84 Author: Imesh Gunaratne <[email protected]> Authored: Wed Jan 28 00:02:12 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Jan 28 00:02:12 2015 +0530 ---------------------------------------------------------------------- .../cartridgeagent/cartridgeagent/agent.py | 2 +- .../cartridgeagent/modules/extensions/defaultextensionhandler.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2de14cd3/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py index 04e6313..1ffdec9 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py @@ -75,7 +75,7 @@ class CartridgeAgent(threading.Thread): #Start tenant event receiver thread self.register_tenant_event_listeners() - #wait for intance spawned event + #wait for member initialized event while not self.cartridge_agent_config.initialized: self.log.debug("Waiting for cartridge agent to be initialized...") time.sleep(1) http://git-wip-us.apache.org/repos/asf/stratos/blob/2de14cd3/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py index ff4f3ae..7777801 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/extensions/defaultextensionhandler.py @@ -156,8 +156,6 @@ class DefaultExtensionHandler(AbstractExtensionHandler): if not consistant: return - else: - self.cartridge_agent_config.initialized = True topology = complete_topology_event.get_topology() service = topology.get_service(service_name_in_payload)
