Update the python agent publisher events with instance_id
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/41f3c318 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/41f3c318 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/41f3c318 Branch: refs/heads/master Commit: 41f3c318cbd7167480cd764d9e9b42c8b1558de3 Parents: 102a039 Author: gayan <[email protected]> Authored: Thu Dec 4 20:02:35 2014 +0530 Committer: gayan <[email protected]> Committed: Thu Dec 4 20:02:35 2014 +0530 ---------------------------------------------------------------------- .../modules/publisher/cartridgeagentpublisher.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/41f3c318/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py index b218fbe..893b679 100644 --- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py +++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/publisher/cartridgeagentpublisher.py @@ -46,9 +46,10 @@ def publish_instance_started_event(): network_partition_id = CartridgeAgentConfiguration().network_partition_id parition_id = CartridgeAgentConfiguration().partition_id member_id = CartridgeAgentConfiguration().member_id + instance_id = CartridgeAgentConfiguration().instance_id instance_started_event = InstanceStartedEvent(service_name, cluster_id, network_partition_id, parition_id, - member_id) + member_id,instance_id) publisher = get_publisher(cartridgeagentconstants.INSTANCE_STATUS_TOPIC + cartridgeagentconstants.INSTANCE_STARTED_EVENT) publisher.publish(instance_started_event) started = True @@ -66,9 +67,10 @@ def publish_instance_activated_event(): network_partition_id = CartridgeAgentConfiguration().network_partition_id parition_id = CartridgeAgentConfiguration().partition_id member_id = CartridgeAgentConfiguration().member_id + instance_id= CartridgeAgentConfiguration().instance_id instance_activated_event = InstanceActivatedEvent(service_name, cluster_id, network_partition_id, parition_id, - member_id) + member_id,instance_id) publisher = get_publisher(cartridgeagentconstants.INSTANCE_STATUS_TOPIC + cartridgeagentconstants.INSTANCE_ACTIVATED_EVENT) publisher.publish(instance_activated_event) @@ -108,9 +110,10 @@ def publish_maintenance_mode_event(): network_partition_id = CartridgeAgentConfiguration().network_partition_id parition_id = CartridgeAgentConfiguration().partition_id member_id = CartridgeAgentConfiguration().member_id + instance_id = CartridgeAgentConfiguration().instance_id instance_maintenance_mode_event = InstanceMaintenanceModeEvent(service_name, cluster_id, network_partition_id, parition_id, - member_id) + member_id,instance_id) publisher = get_publisher(cartridgeagentconstants.INSTANCE_STATUS_TOPIC + cartridgeagentconstants.INSTANCE_MAINTENANCE_MODE_EVENT) publisher.publish(instance_maintenance_mode_event) @@ -131,9 +134,10 @@ def publish_instance_ready_to_shutdown_event(): network_partition_id = CartridgeAgentConfiguration().network_partition_id parition_id = CartridgeAgentConfiguration().partition_id member_id = CartridgeAgentConfiguration().member_id + instance_id = CartridgeAgentConfiguration().instance_id instance_shutdown_event = InstanceReadyToShutdownEvent(service_name, cluster_id, network_partition_id, parition_id, - member_id) + member_id,instance_id) publisher = get_publisher(cartridgeagentconstants.INSTANCE_STATUS_TOPIC + cartridgeagentconstants.INSTANCE_READY_TO_SHUTDOWN_EVENT) publisher.publish(instance_shutdown_event)
