Fixed missing null checks Added health stats publishing username and password to the configuration Fixed topology events not returning the deserialized objects
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dc4d2ad1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dc4d2ad1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dc4d2ad1 Branch: refs/heads/master Commit: dc4d2ad1d3cb98e9c39f2859e9f3291672e5a720 Parents: b6a871d Author: Chamila de Alwis <[email protected]> Authored: Sat Oct 11 21:43:35 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Sat Oct 11 21:43:35 2014 +0530 ---------------------------------------------------------------------- .../cartridge-agent/agent.conf | 2 ++ .../python-cartridge-agent/cartridge-agent/agent.py | 2 +- .../modules/datapublisher/logpublisher.py | 15 +++++++-------- .../cartridge-agent/modules/event/topology/events.py | 7 +++++++ .../modules/extensions/defaultextensionhandler.py | 2 +- .../modules/healthstatspublisher/healthstats.py | 8 ++++---- 6 files changed, 22 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dc4d2ad1/tools/python-cartridge-agent/cartridge-agent/agent.conf ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/agent.conf b/tools/python-cartridge-agent/cartridge-agent/agent.conf index 1bb65d8..5c087e9 100644 --- a/tools/python-cartridge-agent/cartridge-agent/agent.conf +++ b/tools/python-cartridge-agent/cartridge-agent/agent.conf @@ -21,6 +21,8 @@ mb.port =MB-PORT listen.address =LISTEN_ADDR 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/cartridge-agent/payload/launch-params extensions.dir =/mnt/cartridge-agent/extensions cep.stats.publisher.enabled =ENABLE_HEALTH_PUBLISHER http://git-wip-us.apache.org/repos/asf/stratos/blob/dc4d2ad1/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 c2976a8..aacfb2e 100644 --- a/tools/python-cartridge-agent/cartridge-agent/agent.py +++ b/tools/python-cartridge-agent/cartridge-agent/agent.py @@ -203,7 +203,7 @@ class CartridgeAgent(threading.Thread): try: CartridgeAgent.extension_handler.on_member_activated_event(event_obj) except: - self.log.exception("Error processing member terminated event") + self.log.exception("Error processing member activated event") def on_member_terminated(self, msg): self.log.debug("Member terminated event received: %r" % msg.payload) http://git-wip-us.apache.org/repos/asf/stratos/blob/dc4d2ad1/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py b/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py index cf91736..050dd9e 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/datapublisher/logpublisher.py @@ -242,7 +242,6 @@ class DataPublisherConfiguration: self.read_config() - def read_config(self): self.enabled = True if self.cartridge_agent_config.read_property(cartridgeagentconstants.MONITORING_PUBLISHER_ENABLED, False).strip().lower() == "true" else False if not self.enabled: @@ -252,23 +251,23 @@ class DataPublisherConfiguration: DataPublisherConfiguration.log.info("Data Publisher enabled") self.monitoring_server_ip = self.cartridge_agent_config.read_property(cartridgeagentconstants.MONITORING_RECEIVER_IP, False) - if self.monitoring_server_ip.strip() == "": + if self.monitoring_server_ip is None or self.monitoring_server_ip.strip() == "": raise RuntimeError("System property not found: " + cartridgeagentconstants.MONITORING_RECEIVER_IP) self.monitoring_server_port = self.cartridge_agent_config.read_property(cartridgeagentconstants.MONITORING_RECEIVER_PORT, False) - if self.monitoring_server_port.strip() == "": + if self.monitoring_server_port is None or self.monitoring_server_port.strip() == "": raise RuntimeError("System property not found: " + cartridgeagentconstants.MONITORING_RECEIVER_PORT) - # self.monitoring_server_secure_port = self.cartridge_agent_config.read_property("monitoring.server.secure.port", False) - # if self.monitoring_server_secure_port.strip() == "": - # raise RuntimeError("System property not found: monitoring.server.secure.port") + self.monitoring_server_secure_port = self.cartridge_agent_config.read_property("monitoring.server.secure.port", False) + if self.monitoring_server_secure_port is None or self.monitoring_server_secure_port.strip() == "": + raise RuntimeError("System property not found: monitoring.server.secure.port") self.admin_username = self.cartridge_agent_config.read_property(cartridgeagentconstants.MONITORING_SERVER_ADMIN_USERNAME, False) - if self.admin_username.strip() == "": + if self.admin_username is None or self.admin_username.strip() == "": raise RuntimeError("System property not found: " + cartridgeagentconstants.MONITORING_SERVER_ADMIN_USERNAME) self.admin_password = self.cartridge_agent_config.read_property(cartridgeagentconstants.MONITORING_SERVER_ADMIN_PASSWORD, False) - if self.admin_password.strip() == "": + if self.admin_password is None or self.admin_password.strip() == "": raise RuntimeError("System property not found: " + cartridgeagentconstants.MONITORING_SERVER_ADMIN_PASSWORD) DataPublisherConfiguration.log.info("Data Publisher configuration initialized") http://git-wip-us.apache.org/repos/asf/stratos/blob/dc4d2ad1/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py b/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py index 72c4a99..8a89c98 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/event/topology/events.py @@ -68,6 +68,8 @@ class MemberActivatedEvent: port_obj = Port(port_str["protocol"], port_str["value"], port_proxy) instance.port_map[port_proxy] = port_obj + return instance + class MemberTerminatedEvent: @@ -96,6 +98,8 @@ class MemberTerminatedEvent: instance.partition_id = json_obj["partitionId"] if "partitionId" in json_obj else None instance.member_id = json_obj["memberId"] if "memberId" in json_obj else None + return instance + class MemberSuspendedEvent: @@ -122,6 +126,8 @@ class MemberSuspendedEvent: instance.partition_id = json_obj["partitionId"] if "partitionId" in json_obj else None instance.member_id = json_obj["memberId"] if "memberId" in json_obj else None + return instance + class CompleteTopologyEvent: @@ -229,3 +235,4 @@ class MemberStartedEvent: instance.partition_id = json_obj["partitionId"] if "partitionId" in json_obj else None instance.member_id = json_obj["memberId"] if "memberId" in json_obj else None + return instance \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/dc4d2ad1/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 8ee3cd6..f2ec818 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/extensions/defaultextensionhandler.py @@ -159,7 +159,7 @@ class DefaultExtensionHandler(AbstractExtensionHandler): ports = member_activated_event.port_map.values() ports_str = "" for port in ports: - ports_str += port.protocol + "," + port.value + "," + port.proxy + "|" + ports_str += port.protocol + "," + str(port.value) + "," + str(port.proxy) + "|" env_params["STRATOS_MEMBER_ACTIVATED_PORTS"] = ports_str http://git-wip-us.apache.org/repos/asf/stratos/blob/dc4d2ad1/tools/python-cartridge-agent/cartridge-agent/modules/healthstatspublisher/healthstats.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/healthstatspublisher/healthstats.py b/tools/python-cartridge-agent/cartridge-agent/modules/healthstatspublisher/healthstats.py index aafe4db..fd833c4 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/healthstatspublisher/healthstats.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/healthstatspublisher/healthstats.py @@ -214,22 +214,22 @@ class CEPPublisherConfiguration: self.server_ip = self.cartridge_agent_config.read_property( cartridgeagentconstants.CEP_RECEIVER_IP, False) - if self.server_ip.strip() == "": + if self.server_ip is None or self.server_ip.strip() == "": raise RuntimeError("System property not found: " + cartridgeagentconstants.CEP_RECEIVER_IP) self.server_port = self.cartridge_agent_config.read_property( cartridgeagentconstants.CEP_RECEIVER_PORT, False) - if self.server_port.strip() == "": + if self.server_port is None or self.server_port.strip() == "": raise RuntimeError("System property not found: " + cartridgeagentconstants.CEP_RECEIVER_PORT) self.admin_username = self.cartridge_agent_config.read_property( cartridgeagentconstants.CEP_SERVER_ADMIN_USERNAME, False) - if self.admin_username.strip() == "": + if self.admin_username is None or self.admin_username.strip() == "": raise RuntimeError("System property not found: " + cartridgeagentconstants.CEP_SERVER_ADMIN_USERNAME) self.admin_password = self.cartridge_agent_config.read_property( cartridgeagentconstants.CEP_SERVER_ADMIN_PASSWORD, False) - if self.admin_password.strip() == "": + if self.admin_password is None or self.admin_password.strip() == "": raise RuntimeError("System property not found: " + cartridgeagentconstants.CEP_SERVER_ADMIN_PASSWORD) CEPPublisherConfiguration.log.info("CEP Publisher configuration initialized")
