You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/10/11 11:09:52 UTC
[27/50] [abbrv] git commit: Fixed minor issues in cartridge agent and
cartridge agent configuration
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/116d8f6f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/116d8f6f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/116d8f6f
Branch: refs/heads/master
Commit: 116d8f6f16cdda62b6c3e9065ae2b406ea1c196a
Parents: 59c1488
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Sun Sep 28 14:06:48 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Sat Oct 11 14:38:29 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/116d8f6f/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/116d8f6f/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 """