You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/10/07 15:53:56 UTC
[1/2] stratos git commit: Refining log level in eventhandler.py
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 8cd43f08c -> 2fd1d8035
Refining log level in eventhandler.py
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2fd1d803
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2fd1d803
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2fd1d803
Branch: refs/heads/stratos-4.1.x
Commit: 2fd1d8035697bff31a3b69759e64ecbc7d896686
Parents: aeaab4a
Author: Thanuja <th...@wso2.com>
Authored: Wed Oct 7 11:27:00 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Wed Oct 7 19:20:52 2015 +0530
----------------------------------------------------------------------
.../modules/event/eventhandler.py | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2fd1d803/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 c8cb288..ca21a20 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
@@ -59,7 +59,7 @@ class EventHandler:
self.execute_event_extendables(constants.INSTANCE_ACTIVATED_EVENT, {})
def on_artifact_updated_event(self, artifacts_updated_event):
- self.__log.info("Processing Artifact update event: [tenant] %s [cluster] %s [status] %s" %
+ self.__log.debug("Processing Artifact update event: [tenant] %s [cluster] %s [status] %s" %
(str(artifacts_updated_event.tenant_id),
artifacts_updated_event.cluster_id,
artifacts_updated_event.status))
@@ -137,22 +137,22 @@ class EventHandler:
update_interval)
def on_artifact_update_scheduler_event(self, tenant_id):
- self.__log.info("Processing Artifact update scheduler event...")
+ self.__log.debug("Processing Artifact update scheduler event...")
plugin_values = {"ARTIFACT_UPDATED_TENANT_ID": str(tenant_id),
"ARTIFACT_UPDATED_SCHEDULER": str(True)}
self.execute_event_extendables("ArtifactUpdateSchedulerEvent", plugin_values)
def on_instance_cleanup_cluster_event(self):
- self.__log.info("Processing instance cleanup cluster event...")
+ self.__log.debug("Processing instance cleanup cluster event...")
self.cleanup(constants.INSTANCE_CLEANUP_CLUSTER_EVENT)
def on_instance_cleanup_member_event(self):
- self.__log.info("Processing instance cleanup member event...")
+ self.__log.debug("Processing instance cleanup member event...")
self.cleanup(constants.INSTANCE_CLEANUP_MEMBER_EVENT)
def on_member_activated_event(self, member_activated_event):
- self.__log.info("Processing Member activated event: [service] %r [cluster] %r [member] %r"
+ self.__log.debug("Processing Member activated event: [service] %r [cluster] %r [member] %r"
% (member_activated_event.service_name,
member_activated_event.cluster_id,
member_activated_event.member_id))
@@ -237,7 +237,7 @@ class EventHandler:
self.execute_event_extendables(constants.COMPLETE_TENANT_EVENT, plugin_values)
def on_member_terminated_event(self, member_terminated_event):
- self.__log.info("Processing Member terminated event: [service] %s [cluster] %s [member] %s" %
+ self.__log.debug("Processing Member terminated event: [service] %s [cluster] %s [member] %s" %
(member_terminated_event.service_name, member_terminated_event.cluster_id,
member_terminated_event.member_id))
@@ -254,7 +254,7 @@ class EventHandler:
self.execute_event_extendables(constants.MEMBER_TERMINATED_EVENT, {})
def on_member_suspended_event(self, member_suspended_event):
- self.__log.info("Processing Member suspended event: [service] %s [cluster] %s [member] %s" %
+ self.__log.debug("Processing Member suspended event: [service] %s [cluster] %s [member] %s" %
(member_suspended_event.service_name, member_suspended_event.cluster_id,
member_suspended_event.member_id))
@@ -271,7 +271,7 @@ class EventHandler:
self.execute_event_extendables(constants.MEMBER_SUSPENDED_EVENT, {})
def on_member_started_event(self, member_started_event):
- self.__log.info("Processing Member started event: [service] %s [cluster] %s [member] %s" %
+ self.__log.debug("Processing Member started event: [service] %s [cluster] %s [member] %s" %
(member_started_event.service_name, member_started_event.cluster_id,
member_started_event.member_id))
@@ -288,7 +288,7 @@ class EventHandler:
self.execute_event_extendables(constants.MEMBER_STARTED_EVENT, {})
def start_server_extension(self):
- self.__log.info("Processing start server extension...")
+ self.__log.debug("Processing start server extension...")
service_name_in_payload = Config.service_name
cluster_id_in_payload = Config.cluster_id
member_id_in_payload = Config.member_id
@@ -302,12 +302,12 @@ class EventHandler:
self.execute_event_extendables("StartServers", {})
def volume_mount_extension(self, persistence_mappings_payload):
- self.__log.info("Processing volume mount extension...")
+ self.__log.debug("Processing volume mount extension...")
self.execute_event_extendables("VolumeMount", persistence_mappings_payload)
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(
+ self.__log.debug(
"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
@@ -341,12 +341,12 @@ class EventHandler:
self.execute_event_extendables(constants.DOMAIN_MAPPING_REMOVED_EVENT, plugin_values)
def on_copy_artifacts_extension(self, src, dest):
- self.__log.info("Processing Copy artifacts extension...")
+ self.__log.debug("Processing Copy artifacts extension...")
plugin_values = {"SOURCE": src, "DEST": dest}
self.execute_event_extendables("CopyArtifacts", plugin_values)
def on_tenant_subscribed_event(self, tenant_subscribed_event):
- self.__log.info(
+ self.__log.debug(
"Processing Tenant subscribed event: [tenant] " + str(tenant_subscribed_event.tenant_id) +
" [service] " + tenant_subscribed_event.service_name + " [cluster] " + tenant_subscribed_event.cluster_ids
)
@@ -354,7 +354,7 @@ class EventHandler:
self.execute_event_extendables(constants.TENANT_SUBSCRIBED_EVENT, {})
def on_application_signup_removed_event(self, application_signup_removal_event):
- self.__log.info(
+ self.__log.debug(
"Processing Tenant unsubscribed event: [tenant] " + str(application_signup_removal_event.tenantId) +
" [application ID] " + str(application_signup_removal_event.applicationId)
)
@@ -365,14 +365,14 @@ class EventHandler:
self.execute_event_extendables(constants.APPLICATION_SIGNUP_REMOVAL_EVENT, {})
def cleanup(self, event):
- self.__log.info("Executing cleaning up the data in the cartridge instance...")
+ self.__log.debug("Executing cleaning up the data in the cartridge instance...")
publisher.publish_maintenance_mode_event()
self.execute_event_extendables("clean", {})
- self.__log.info("cleaning up finished in the cartridge instance...")
+ self.__log.info("Cleaning up finished in the cartridge instance...")
- self.__log.info("publishing ready to shutdown event...")
+ self.__log.info("Publishing ready to shutdown event...")
publisher.publish_instance_ready_to_shutdown_event()
def execute_event_extendables(self, event, input_values):
@@ -386,7 +386,7 @@ class EventHandler:
except Exception as e:
self.__log.error("Error while adding common input values for event extendables: %s" % e)
input_values["EVENT"] = event
- self.__log.info("Executing extensions for [event] %s with [input values] %s" % (event, input_values))
+ self.__log.debug("Executing extensions for [event] %s with [input values] %s" % (event, input_values))
# Execute the extension
self.execute_extension_for_event(event, input_values)
# Execute the plugins
[2/2] stratos git commit: Refining logs in agentgithandler.py
Posted by ra...@apache.org.
Refining logs in agentgithandler.py
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/aeaab4a1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/aeaab4a1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/aeaab4a1
Branch: refs/heads/stratos-4.1.x
Commit: aeaab4a13ff790b09fa855535f7640a22ee4a910
Parents: 8cd43f0
Author: Thanuja <th...@wso2.com>
Authored: Tue Oct 6 13:45:59 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Wed Oct 7 19:20:52 2015 +0530
----------------------------------------------------------------------
.../modules/artifactmgt/git/agentgithandler.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/aeaab4a1/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
index 008c8d7..257575f 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
@@ -73,7 +73,7 @@ class AgentGitHandler:
AgentGitHandler.log.debug("Git pull executed: [tenant-id] %s [repo-url] %s",
git_repo.tenant_id, git_repo.repo_url)
except GitRepositorySynchronizationException as e:
- AgentGitHandler.log.debug("Warning: Git Pull operation failed: %s" % e)
+ AgentGitHandler.log.error("Git pull operation failed: %s" % e)
else:
# not a valid repository, might've been corrupted. do a re-clone
@@ -99,7 +99,7 @@ class AgentGitHandler:
except GitRepositorySynchronizationException as e:
AgentGitHandler.log.error("Git clone operation failed: %s" % e)
# If first git clone is failed, execute retry_clone operation
- AgentGitHandler.log.info("Retrying Git clone operation...")
+ AgentGitHandler.log.info("Retrying git clone operation...")
AgentGitHandler.retry_clone(git_repo)
AgentGitHandler.add_repo(git_repo)
return subscribe_run, updated
@@ -168,7 +168,7 @@ class AgentGitHandler:
# check if modified files are present
modified = AgentGitHandler.has_modified_files(git_repo.local_repo_path)
if modified:
- AgentGitHandler.log.info("Unstaged files exist in working directory. Aborting Git pull...")
+ AgentGitHandler.log.info("Unstaged files exist in working directory. Aborting git pull...")
return
# HEAD before pull
@@ -431,9 +431,9 @@ class AgentGitHandler:
git_repo.scheduled_update_task = async_task
async_task.start()
- AgentGitHandler.log.info("Scheduled Artifact Synchronization Task for path %s" % git_repo.local_repo_path)
+ AgentGitHandler.log.info("Scheduled artifact synchronization task for path %s" % git_repo.local_repo_path)
else:
- AgentGitHandler.log.info("Artifact Synchronization Task for path %s already scheduled"
+ AgentGitHandler.log.info("Artifact synchronization task for path %s already scheduled"
% git_repo.local_repo_path)
@staticmethod
@@ -450,7 +450,7 @@ class AgentGitHandler:
AgentGitHandler.log.exception("Repository folder not deleted: %s" % e)
AgentGitHandler.clear_repo(tenant_id)
- AgentGitHandler.log.info("git repository deleted for tenant %s" % git_repo.tenant_id)
+ AgentGitHandler.log.info("Git repository deleted for tenant %s" % git_repo.tenant_id)
return True
@@ -469,8 +469,8 @@ class AgentGitHandler:
AgentGitHandler.log.info("Executing Git command: %s" % command)
p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os_env, cwd=repo_path)
(output, errors) = p.communicate()
- AgentGitHandler.log.info("Git command [output] %s" % str(output))
- AgentGitHandler.log.info("Git command [errors] %s" % str(errors))
+ AgentGitHandler.log.debug("Git command [output] %s" % str(output))
+ AgentGitHandler.log.debug("Git command [errors] %s" % str(errors))
return output, errors