Repository: stratos Updated Branches: refs/heads/master 75ee9598f -> bd32dcd3f
PCA - Log corrections and topology initialization flag Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2c82881d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2c82881d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2c82881d Branch: refs/heads/master Commit: 2c82881ddcac0beae7b1218bdb429ea4770083fe Parents: 75ee959 Author: Chamila de Alwis <[email protected]> Authored: Wed Dec 2 16:45:03 2015 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Thu Dec 17 18:22:37 2015 +0530 ---------------------------------------------------------------------- .../python/cartridge.agent/cartridge.agent/agent.py | 15 ++++++++------- .../python/cartridge.agent/cartridge.agent/entity.py | 3 +++ .../modules/artifactmgt/git/agentgithandler.py | 4 ++++ .../cartridge.agent/modules/event/eventhandler.py | 9 +-------- 4 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2c82881d/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py index 7f95f26..cec80fc 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py +++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.py @@ -239,7 +239,7 @@ class Handlers(object): Handlers.__log.debug("Member initialized event received: %r" % msg.payload) event_obj = MemberInitializedEvent.create_from_json(msg.payload) - if not TopologyContext.topology.initialized: + if not TopologyContext.initialized: return event_handler.on_member_initialized_event(event_obj) @@ -247,7 +247,7 @@ class Handlers(object): @staticmethod def on_member_activated(msg): Handlers.__log.debug("Member activated event received: %r" % msg.payload) - if not TopologyContext.topology.initialized: + if not TopologyContext.initialized: return event_obj = MemberActivatedEvent.create_from_json(msg.payload) @@ -256,7 +256,7 @@ class Handlers(object): @staticmethod def on_member_terminated(msg): Handlers.__log.debug("Member terminated event received: %r" % msg.payload) - if not TopologyContext.topology.initialized: + if not TopologyContext.initialized: return event_obj = MemberTerminatedEvent.create_from_json(msg.payload) @@ -265,7 +265,7 @@ class Handlers(object): @staticmethod def on_member_suspended(msg): Handlers.__log.debug("Member suspended event received: %r" % msg.payload) - if not TopologyContext.topology.initialized: + if not TopologyContext.initialized: return event_obj = MemberSuspendedEvent.create_from_json(msg.payload) @@ -275,9 +275,9 @@ class Handlers(object): def on_complete_topology(msg): event_obj = CompleteTopologyEvent.create_from_json(msg.payload) TopologyContext.update(event_obj.topology) - if not TopologyContext.topology.initialized: + if not TopologyContext.initialized: + TopologyContext.initialized = True Handlers.__log.info("Topology initialized from complete topology event") - TopologyContext.topology.initialized = True event_handler.on_complete_topology_event(event_obj) Handlers.__log.debug("Topology context updated with [topology] %r" % event_obj.topology.json_str) @@ -285,7 +285,7 @@ class Handlers(object): @staticmethod def on_member_started(msg): Handlers.__log.debug("Member started event received: %r" % msg.payload) - if not TopologyContext.topology.initialized: + if not TopologyContext.initialized: return event_obj = MemberStartedEvent.create_from_json(msg.payload) @@ -327,6 +327,7 @@ class Handlers(object): event_handler.on_application_signup_removed_event(event_obj) + if __name__ == "__main__": log = LogFactory().get_log(__name__) try: http://git-wip-us.apache.org/repos/asf/stratos/blob/2c82881d/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/entity.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/entity.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/entity.py index a198529..d00afd0 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/entity.py +++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/entity.py @@ -18,6 +18,7 @@ import constants import json + class Topology: """ Represents the topology provided by the Cloud Controller @@ -497,6 +498,7 @@ class TopologyContext: Handles and maintains a model of the topology provided by the Cloud Controller """ topology = Topology() + initialized = False @staticmethod def get_topology(): @@ -507,6 +509,7 @@ class TopologyContext: @staticmethod def update(topology): TopologyContext.topology = topology + TopologyContext.initialized = True class Tenant: http://git-wip-us.apache.org/repos/asf/stratos/blob/2c82881d/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 15d3733..fb2c534 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 @@ -290,6 +290,10 @@ class AgentGitHandler: return if git_repo.scheduled_update_task is None: + AgentGitHandler.log.info( + "ADC configuration: [auto-commit] %s, [auto-checkout] %s, [interval] %s", + auto_commit, auto_checkout, update_interval) + artifact_update_task = ArtifactUpdateTask(repo_info, auto_checkout, auto_commit) async_task = ScheduledExecutor(update_interval, artifact_update_task) http://git-wip-us.apache.org/repos/asf/stratos/blob/2c82881d/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 cea3c01..a4ff074 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 @@ -133,21 +133,14 @@ def on_artifact_updated_event(artifacts_updated_event): update_artifacts = Config.read_property(constants.ENABLE_ARTIFACT_UPDATE, True) auto_commit = Config.is_commits_enabled auto_checkout = Config.is_checkout_enabled - log.info("ADC configuration: [update_artifacts] %s, [auto-commit] %s, [auto-checkout] %s" - % (update_artifacts, auto_commit, auto_checkout)) if update_artifacts: try: update_interval = int(Config.artifact_update_interval) except ValueError: - log.exception("Invalid artifact sync interval specified: %s" % ValueError) + log.exception("Invalid artifact sync interval specified: %s, defaulting to 10 seconds" % ValueError) update_interval = 10 - log.info("Artifact updating task enabled, update interval: %s seconds" % update_interval) - - log.info("Auto Commit is turned %s " % ("on" if auto_commit else "off")) - log.info("Auto Checkout is turned %s " % ("on" if auto_checkout else "off")) - AgentGitHandler.schedule_artifact_update_task( repo_info, auto_checkout,
