You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/31 19:54:51 UTC
[1/2] stratos git commit: Commiting fix provided by Chamila,
for python agent loggin issue with String and integer concat
Repository: stratos
Updated Branches:
refs/heads/master 71d0df4c7 -> dd013827e
Commiting fix provided by Chamila, for python agent loggin issue with String and integer concat
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3c4248dc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3c4248dc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3c4248dc
Branch: refs/heads/master
Commit: 3c4248dc65481a1c64c2efa496a1c9aae3f5a9c1
Parents: 71d0df4
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun May 31 23:23:04 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun May 31 23:23:04 2015 +0530
----------------------------------------------------------------------
.../cartridge.agent/modules/event/eventhandler.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3c4248dc/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py
index 1b124bb..153045c 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py
@@ -65,7 +65,7 @@ class EventHandler:
def on_artifact_updated_event(self, artifacts_updated_event):
self.__log.info("Processing Artifact update event: [tenant] %s [cluster] %s [status] %s" %
- (artifacts_updated_event.tenant_id,
+ (str(artifacts_updated_event.tenant_id),
artifacts_updated_event.cluster_id,
artifacts_updated_event.status))
@@ -92,7 +92,7 @@ class EventHandler:
raise GitRepositorySynchronizationException("Repository path is empty. Cannot perform Git operations.")
# create repo object
- local_repo_path = self.get_repo_path_for_tenant(tenant_id, local_repo_path, is_multitenant)
+ local_repo_path = self.get_repo_path_for_tenant(str(tenant_id), local_repo_path, is_multitenant)
repo_info = Repository(repo_url, repo_username, repo_password, local_repo_path, tenant_id, commit_enabled)
# checkout code
@@ -300,7 +300,7 @@ class EventHandler:
def on_domain_mapping_added_event(self, domain_mapping_added_event):
tenant_domain = EventHandler.find_tenant_domain(domain_mapping_added_event.tenant_id)
self.__log.info(
- "Processing Domain mapping added event: [tenant-id] " + domain_mapping_added_event.tenant_id +
+ "Processing Domain mapping added event: [tenant-id] " + str(domain_mapping_added_event.tenant_id) +
" [tenant-domain] " + tenant_domain + " [domain-name] " + domain_mapping_added_event.domain_name +
" [application-context] " + domain_mapping_added_event.application_context
)
@@ -319,7 +319,7 @@ class EventHandler:
def on_domain_mapping_removed_event(self, domain_mapping_removed_event):
tenant_domain = EventHandler.find_tenant_domain(domain_mapping_removed_event.tenant_id)
self.__log.info(
- "Domain mapping removed event received: [tenant-id] " + domain_mapping_removed_event.tenant_id +
+ "Domain mapping removed event received: [tenant-id] " + str(domain_mapping_removed_event.tenant_id) +
" [tenant-domain] " + tenant_domain + " [domain-name] " + domain_mapping_removed_event.domain_name
)
@@ -339,7 +339,7 @@ class EventHandler:
def on_tenant_subscribed_event(self, tenant_subscribed_event):
self.__log.info(
- "Processing Tenant subscribed event: [tenant] " + tenant_subscribed_event.tenant_id +
+ "Processing Tenant subscribed event: [tenant] " + str(tenant_subscribed_event.tenant_id) +
" [service] " + tenant_subscribed_event.service_name + " [cluster] " + tenant_subscribed_event.cluster_ids
)
@@ -347,8 +347,8 @@ class EventHandler:
def on_application_signup_removed_event(self, application_signup_removal_event):
self.__log.info(
- "Processing Tenant unsubscribed event: [tenant] " + application_signup_removal_event.tenantId +
- " [application ID] " + application_signup_removal_event.applicationId
+ "Processing Tenant unsubscribed event: [tenant] " + str(application_signup_removal_event.tenantId) +
+ " [application ID] " + str(application_signup_removal_event.applicationId)
)
if self.__config.application_id == application_signup_removal_event.applicationId:
@@ -696,7 +696,7 @@ class EventHandler:
def find_tenant_domain(tenant_id):
tenant = TenantContext.get_tenant(tenant_id)
if tenant is None:
- raise RuntimeError("Tenant could not be found: [tenant-id] %s" % tenant_id)
+ raise RuntimeError("Tenant could not be found: [tenant-id] %s" % str(tenant_id))
return tenant.tenant_domain
[2/2] stratos git commit: s/tenant_Id/tenantId
Posted by la...@apache.org.
s/tenant_Id/tenantId
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dd013827
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dd013827
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dd013827
Branch: refs/heads/master
Commit: dd013827ea73023c32fca04a9574febb6d05966c
Parents: 3c4248d
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun May 31 23:24:42 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun May 31 23:24:42 2015 +0530
----------------------------------------------------------------------
.../cartridge.agent/cartridge.agent/modules/event/eventhandler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/dd013827/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py
index 153045c..ed64f6e 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/event/eventhandler.py
@@ -352,7 +352,7 @@ class EventHandler:
)
if self.__config.application_id == application_signup_removal_event.applicationId:
- AgentGitHandler.remove_repo(application_signup_removal_event.tenant_Id)
+ AgentGitHandler.remove_repo(application_signup_removal_event.tenantId)
self.execute_event_extendables(constants.APPLICATION_SIGNUP_REMOVAL_EVENT, {})