Convert all values to str before being passed to Popen
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fdf0d19a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fdf0d19a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fdf0d19a Branch: refs/heads/master Commit: fdf0d19a6a128dbd39221844506e78e1c742a67c Parents: 3360d54 Author: Chamila de Alwis <[email protected]> Authored: Sat Oct 11 22:36:49 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Sat Oct 11 22:36:49 2014 +0530 ---------------------------------------------------------------------- .../extensions/defaultextensionhandler.py | 20 ++++++++++---------- .../modules/util/extensionutils.py | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/fdf0d19a/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py b/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py index f0b9987..2e79f3e 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py @@ -149,12 +149,12 @@ class DefaultExtensionHandler(AbstractExtensionHandler): if extensionutils.is_relevant_member_event(member_activated_event.service_name, member_activated_event.cluster_id, lb_cluster_id): - env_params = {"STRATOS_MEMBER_ACTIVATED_MEMBER_IP": member_activated_event.member_ip, - "STRATOS_MEMBER_ACTIVATED_MEMBER_ID": member_activated_event.member_id, - "STRATOS_MEMBER_ACTIVATED_CLUSTER_ID": member_activated_event.cluster_id, - "STRATOS_MEMBER_ACTIVATED_LB_CLUSTER_ID": lb_cluster_id, - "STRATOS_MEMBER_ACTIVATED_NETWORK_PARTITION_ID": member_activated_event.network_partition_id, - "STRATOS_MEMBER_ACTIVATED_SERVICE_NAME": member_activated_event.service_name} + env_params = {"STRATOS_MEMBER_ACTIVATED_MEMBER_IP": str(member_activated_event.member_ip), + "STRATOS_MEMBER_ACTIVATED_MEMBER_ID": str(member_activated_event.member_id), + "STRATOS_MEMBER_ACTIVATED_CLUSTER_ID": str(member_activated_event.cluster_id), + "STRATOS_MEMBER_ACTIVATED_LB_CLUSTER_ID": str(lb_cluster_id), + "STRATOS_MEMBER_ACTIVATED_NETWORK_PARTITION_ID": str(member_activated_event.network_partition_id), + "STRATOS_MEMBER_ACTIVATED_SERVICE_NAME": str(member_activated_event.service_name)} ports = member_activated_event.port_map.values() ports_str = "" @@ -167,8 +167,8 @@ class DefaultExtensionHandler(AbstractExtensionHandler): member_ips = extensionutils.get_lb_member_ip(lb_cluster_id) if member_ips is not None and len(member_ips) > 1: - env_params["STRATOS_MEMBER_ACTIVATED_LB_IP"] = member_ips[0] - env_params["STRATOS_MEMBER_ACTIVATED_LB_PUBLIC_IP"] = member_ips[1] + env_params["STRATOS_MEMBER_ACTIVATED_LB_IP"] = str(member_ips[0]) + env_params["STRATOS_MEMBER_ACTIVATED_LB_PUBLIC_IP"] = str(member_ips[1]) env_params["STRATOS_TOPOLOGY_JSON"] = json.dumps(topology.json_str) @@ -201,8 +201,8 @@ class DefaultExtensionHandler(AbstractExtensionHandler): env_params["STRATOS_UPDATE_WK_IP"] = "true" self.log.debug("Setting env var STRATOS_CLUSTERING to %r" % clustered) - env_params["STRATOS_CLUSTERING"] = clustered - env_params["STRATOS_WK_MEMBER_COUNT"] = self.cartridge_agent_config.min_count + env_params["STRATOS_CLUSTERING"] = str(clustered) + env_params["STRATOS_WK_MEMBER_COUNT"] = str(self.cartridge_agent_config.min_count) extensionutils.execute_member_activated_extension(env_params) else: http://git-wip-us.apache.org/repos/asf/stratos/blob/fdf0d19a/tools/python-cartridge-agent/cartridge-agent/modules/util/extensionutils.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/util/extensionutils.py b/tools/python-cartridge-agent/cartridge-agent/modules/util/extensionutils.py index e686fce..6c58852 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/util/extensionutils.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/util/extensionutils.py @@ -449,7 +449,7 @@ def add_properties(properties, params, prefix): return for key in properties: - params["STRATOS_" + prefix + "_" + key] = properties[key] + params["STRATOS_" + prefix + "_" + key] = str(properties[key]) log.debug("Property added: [key] STRATOS_ " + prefix + "_" + key + "[value] " + properties[key])
