You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/01/03 12:32:02 UTC
[2/3] stratos git commit: Updating python agent to read application
id and send it in instance started event
Updating python agent to read application id and send it in instance started event
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4a53aead
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4a53aead
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4a53aead
Branch: refs/heads/master
Commit: 4a53aeadc11acf3c1a23dfb1517b6e6eeff65d39
Parents: 0fdef65
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Jan 3 13:17:27 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Jan 3 17:01:50 2015 +0530
----------------------------------------------------------------------
.../cartridgeagent/cartridgeagent/agent.py | 2 ++
.../cartridgeagent/modules/config/cartridgeagentconfiguration.py | 3 +++
.../cartridgeagent/modules/event/instance/status/events.py | 4 +++-
.../cartridgeagent/modules/publisher/cartridgeagentpublisher.py | 3 ++-
.../cartridgeagent/modules/util/cartridgeagentconstants.py | 1 +
5 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4a53aead/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py
index 5b32449..04e6313 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/agent.py
@@ -105,6 +105,8 @@ class CartridgeAgent(threading.Thread):
self.log.info("No artifact repository found")
CartridgeAgent.extension_handler.on_instance_activated_event()
cartridgeagentpublisher.publish_instance_activated_event()
+ else:
+ self.log.info("Artifact repository found, waiting for artifact updated event to checkout artifacts: [repo_url] %s", repo_url)
persistence_mappping_payload = self.cartridge_agent_config.persistence_mappings
if persistence_mappping_payload is not None:
http://git-wip-us.apache.org/repos/asf/stratos/blob/4a53aead/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 bb28ab1..c0c7249 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
@@ -35,6 +35,8 @@ class CartridgeAgentConfiguration:
self.properties = None
""" :type : ConfigParser.SafeConfigParser """
+ self.application_id = None
+ """ :type : str """
self.service_group = None
""" :type : str """
self.is_clustered = False
@@ -118,6 +120,7 @@ class CartridgeAgentConfiguration:
# self.__isClustered = self.payload_params[
# cartridgeagentconstants.CLUSTERING] if cartridgeagentconstants.CLUSTERING in self.payload_params else None
+ self.application_id = self.read_property(cartridgeagentconstants.APPLICATION_ID)
self.service_name = self.read_property(cartridgeagentconstants.SERVICE_NAME)
self.cluster_id = self.read_property(cartridgeagentconstants.CLUSTER_ID)
self.cluster_instance_id= self.read_property(cartridgeagentconstants.CLUSTER_INSTANCE_ID)
http://git-wip-us.apache.org/repos/asf/stratos/blob/4a53aead/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/instance/status/events.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/instance/status/events.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/instance/status/events.py
index 1898155..db35987 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/instance/status/events.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/event/instance/status/events.py
@@ -41,8 +41,10 @@ class InstanceActivatedEvent:
class InstanceStartedEvent:
- def __init__(self, service_name, cluster_id, cluster_instance_id, member_id, instance_id,
+ def __init__(self, application_id, service_name, cluster_id, cluster_instance_id, member_id, instance_id,
network_partition_id, partition_id):
+ self.applicationId = application_id
+ """ :type : str """
self.serviceName = service_name
""" :type : str """
self.clusterId = cluster_id
http://git-wip-us.apache.org/repos/asf/stratos/blob/4a53aead/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 b2f174e..dcdba8c 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
@@ -42,6 +42,7 @@ def publish_instance_started_event():
if not started:
log.info("Publishing instance started event")
+ application_id = CartridgeAgentConfiguration().application_id
service_name = CartridgeAgentConfiguration().service_name
cluster_id = CartridgeAgentConfiguration().cluster_id
member_id = CartridgeAgentConfiguration().member_id
@@ -50,7 +51,7 @@ def publish_instance_started_event():
network_partition_id = CartridgeAgentConfiguration().network_partition_id
partition_id = CartridgeAgentConfiguration().partition_id
- instance_started_event = InstanceStartedEvent(service_name, cluster_id, cluster_instance_id, member_id,
+ instance_started_event = InstanceStartedEvent(application_id, service_name, cluster_id, cluster_instance_id, member_id,
instance_id, network_partition_id, partition_id)
publisher = get_publisher(cartridgeagentconstants.INSTANCE_STATUS_TOPIC + cartridgeagentconstants.INSTANCE_STARTED_EVENT)
publisher.publish(instance_started_event)
http://git-wip-us.apache.org/repos/asf/stratos/blob/4a53aead/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py
index 68ef5fb..f7ae20b 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py
@@ -23,6 +23,7 @@ MB_PORT = "mb.port"
CARTRIDGE_KEY = "CARTRIDGE_KEY"
APP_PATH = "APP_PATH"
+APPLICATION_ID = "APPLICATION_ID"
SERVICE_GROUP = "SERIVCE_GROUP"
SERVICE_NAME = "SERVICE_NAME"
CLUSTER_ID = "CLUSTER_ID"