Repository: stratos Updated Branches: refs/heads/master 5d24241a4 -> 882e92a86
Fixed minor issues in cartridge agent and cartridge agent configuration Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0b63370d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0b63370d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0b63370d Branch: refs/heads/master Commit: 0b63370d9198ffa156049f0d8aadccfa11ee24cb Parents: 11231b3 Author: Chamila de Alwis <[email protected]> Authored: Sun Sep 28 14:06:48 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Thu Oct 9 15:38:47 2014 +0530 ---------------------------------------------------------------------- tools/python-cartridge-agent/cartridge-agent/agent.py | 5 ++++- .../modules/config/cartridgeagentconfiguration.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0b63370d/tools/python-cartridge-agent/cartridge-agent/agent.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/agent.py b/tools/python-cartridge-agent/cartridge-agent/agent.py index ad063c8..ff5eaf5 100644 --- a/tools/python-cartridge-agent/cartridge-agent/agent.py +++ b/tools/python-cartridge-agent/cartridge-agent/agent.py @@ -91,19 +91,22 @@ class CartridgeAgent(threading.Thread): CartridgeAgentConfiguration.read_property(cartridgeagentconstants.JNDI_PROPERTIES_DIR) except ParameterNotFoundException: self.log.error("System property not found: %r" % cartridgeagentconstants.JNDI_PROPERTIES_DIR) + return #PARAM_FILE_PATH try: CartridgeAgentConfiguration.read_property(cartridgeagentconstants.PARAM_FILE_PATH) except ParameterNotFoundException: self.log.error("System property not found: %r" % cartridgeagentconstants.PARAM_FILE_PATH) + return #EXTENSIONS_DIR try: CartridgeAgentConfiguration.read_property(cartridgeagentconstants.EXTENSIONS_DIR) except ParameterNotFoundException: self.log.error("System property not found: %r" % cartridgeagentconstants.EXTENSIONS_DIR) - + return + def subscribe_to_topics_and_register_listeners(self): self.log.debug("Starting instance notifier event message receiver thread") http://git-wip-us.apache.org/repos/asf/stratos/blob/0b63370d/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py b/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py index bb26569..43a4e5e 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py @@ -37,9 +37,9 @@ class CartridgeAgentConfiguration: """ :type : str """ repo_url = None """ :type : str """ - ports = {} + ports = [] """ :type : list[str] """ - log_file_paths = {} + log_file_paths = [] """ :type : list[str] """ is_multitenant = False """ :type : bool """
