Strip strings when read from the configuration files Fixed set_attr() value
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b0613711 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b0613711 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b0613711 Branch: refs/heads/master Commit: b06137113e33de69eae66abd7a3b7d3fc661f291 Parents: 1c69a9a Author: Chamila de Alwis <[email protected]> Authored: Fri Oct 10 13:54:56 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Fri Oct 10 13:54:56 2014 +0530 ---------------------------------------------------------------------- .../modules/config/cartridgeagentconfiguration.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b0613711/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 fde28e8..f3376cf 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/config/cartridgeagentconfiguration.py @@ -302,17 +302,18 @@ class CartridgeAgentConfiguration: self.log.debug("Has key: %r" % property_key) temp_str = self.properties.get("agent", property_key) if temp_str != "" and temp_str is not None: - return temp_str + return str(temp_str).strip() if property_key in self.payload_params: temp_str = self.payload_params[property_key] if temp_str != "" and temp_str is not None: - return temp_str + return str(temp_str).strip() if critical: raise ParameterNotFoundException("Cannot find the value of required parameter: %r" % property_key) instance = None + """ :type : __CartridgeAgentConfiguration""" # def __new__(cls, *args, **kwargs): # if not CartridgeAgentConfiguration.instance: @@ -327,8 +328,8 @@ class CartridgeAgentConfiguration: def __getattr__(self, name): return getattr(self.instance, name) - def __setattr__(self, name): - return setattr(self.instance, name) + def __setattr__(self, name, value): + return setattr(self.instance, name, value) from ..exception.parameternotfoundexception import ParameterNotFoundException
