You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/11/20 12:54:09 UTC
[2/3] stratos git commit: Removed version specific entries from
python agent config and derived values from runtime
Removed version specific entries from python agent config and derived values from runtime
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9a475865
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9a475865
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9a475865
Branch: refs/heads/master
Commit: 9a475865c891f1d88d7bba2127bb949c2d4e237a
Parents: 6bb8509
Author: Chamila de Alwis <cs...@chamiladealwis.com>
Authored: Mon Nov 17 02:56:25 2014 +0530
Committer: Chamila de Alwis <cs...@chamiladealwis.com>
Committed: Mon Nov 17 02:56:25 2014 +0530
----------------------------------------------------------------------
.../cartridgeagent/cartridgeagent/agent.conf | 2 --
.../modules/config/cartridgeagentconfiguration.py | 8 ++++++++
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9a475865/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.conf
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.conf b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.conf
index 76270e0..f611cca 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.conf
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.conf
@@ -23,8 +23,6 @@ thrift.receiver.ip =CEP-IP
thrift.receiver.port =CEP-PORT
thrift.server.admin.username =CEP-ADMIN-USERNAME
thrift.server.admin.password =CEP-ADMIN-PASSWORD
-param.file.path =/mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT/payload/launch-params
-extensions.dir =/mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT/extensions
cep.stats.publisher.enabled =ENABLE_HEALTH_PUBLISHER
lb.private.ip =LB_PRIVATE_IP
lb.public.ip =LB_PUBLIC_IP
http://git-wip-us.apache.org/repos/asf/stratos/blob/9a475865/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
index 15871ba..496695d 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
@@ -33,6 +33,7 @@ class CartridgeAgentConfiguration:
self.payload_params = {}
self.properties = None
+ """ :type : ConfigParser.SafeConfigParser """
self.service_group = None
""" :type : str """
@@ -266,6 +267,13 @@ class CartridgeAgentConfiguration:
self.properties = ConfigParser.SafeConfigParser()
self.properties.read(conf_file_path)
+ #set calculated values
+ param_file = os.path.abspath(os.path.dirname(__file__)).split("modules")[0] + "payload/launch-params"
+ self.properties.set("agent", cartridgeagentconstants.PARAM_FILE_PATH, param_file)
+
+ extensions_dir = os.path.abspath(os.path.dirname(__file__)).split("modules")[0] + "extensions"
+ self.properties.set("agent", cartridgeagentconstants.EXTENSIONS_DIR, extensions_dir)
+
def __read_parameter_file(self):
"""
Reads the payload file of the cartridge and stores the values in a dictionary