PCA - Formatting
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/92eb63b5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/92eb63b5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/92eb63b5 Branch: refs/heads/master Commit: 92eb63b52dfef7ad90be2e1a03a787ce23e8a77a Parents: 41bdf48 Author: Chamila de Alwis <[email protected]> Authored: Thu Jul 30 00:13:41 2015 -0400 Committer: Chamila de Alwis <[email protected]> Committed: Thu Jul 30 00:17:45 2015 -0400 ---------------------------------------------------------------------- .../main/python/cartridge.agent/cartridge.agent/constants.py | 3 --- .../python/cartridge.agent/cartridge.agent/healthstats.py | 4 ---- .../main/python/cartridge.agent/cartridge.agent/mdsclient.py | 7 ++++--- .../main/python/cartridge.agent/cartridge.agent/publisher.py | 2 +- .../main/python/cartridge.agent/cartridge.agent/subscriber.py | 5 ++--- 5 files changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/92eb63b5/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py index 395ade5..44e6700 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py +++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py @@ -37,9 +37,6 @@ PARTITION_ID = "PARTITION_ID" TENANT_ID = "TENANT_ID" REPO_URL = "REPO_URL" PORTS = "PORTS" -# DEPLOYMENT = "DEPLOYMENT" -# MANAGER_SERVICE_TYPE = "MANAGER_SERVICE_TYPE" -# WORKER_SERVICE_TYPE = "WORKER_SERVICE_TYPE" PERSISTENCE_MAPPING = "PERSISTENCE_MAPPING" DEPENDENCY_CLUSTER_IDS = "DEPENDENCY_CLUSTER_IDS" EXPORT_METADATA_KEYS = "EXPORT_METADATA_KEYS" http://git-wip-us.apache.org/repos/asf/stratos/blob/92eb63b5/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py index 6b0e9e7..be45294 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py +++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py @@ -44,14 +44,10 @@ class HealthStatisticsPublisherManager(Thread): :return: void """ Thread.__init__(self) - self.log = LogFactory().get_log(__name__) - self.publish_interval = publish_interval """:type : int""" - self.terminated = False - self.publisher = HealthStatisticsPublisher() """:type : HealthStatisticsPublisher""" # If there are no health stat reader plugins, create the default reader instance http://git-wip-us.apache.org/repos/asf/stratos/blob/92eb63b5/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/mdsclient.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/mdsclient.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/mdsclient.py index ef9e7d2..9c38f4e 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/mdsclient.py +++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/mdsclient.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -import urllib2, urllib +import urllib2 from urllib2 import URLError, HTTPError import json from modules.util.log import LogFactory @@ -108,13 +108,14 @@ def update(data): def delete_property_value(property_name, value): log.info("Removing property %s value %s " % (property_name, value)) opener = urllib2.build_opener(urllib2.HTTPHandler) - request = urllib2.Request(mds_url + "/metadata/api/applications/" + app_id + "/properties/" + property_name + "/value/" + value) + request = urllib2.Request( + mds_url + "/metadata/api/applications/" + app_id + "/properties/" + property_name + "/value/" + value) request.add_header("Authorization", "Bearer %s" % token) request.add_header('Content-Type', 'application/json') request.get_method = lambda: 'DELETE' url = opener.open(request) - log.info("Property value removed %s " % (url)) + log.info("Property value removed %s " % url) class MDSPutRequest: http://git-wip-us.apache.org/repos/asf/stratos/blob/92eb63b5/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/publisher.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/publisher.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/publisher.py index 086df0f..716df2d 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/publisher.py +++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/publisher.py @@ -212,4 +212,4 @@ class EventPublisher: mb_ip = Config.read_property(constants.MB_IP) mb_port = Config.read_property(constants.MB_PORT) payload = event.to_json() - publish.single(self.__topic, payload, hostname=mb_ip, port=mb_port) \ No newline at end of file + publish.single(self.__topic, payload, hostname=mb_ip, port=mb_port) http://git-wip-us.apache.org/repos/asf/stratos/blob/92eb63b5/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/subscriber.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/subscriber.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/subscriber.py index 0578d36..93d219b 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/subscriber.py +++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/subscriber.py @@ -19,6 +19,8 @@ from Queue import Queue import threading import paho.mqtt.client as mqtt +from modules.util.log import LogFactory + class EventSubscriber(threading.Thread): """ @@ -112,6 +114,3 @@ class EventExecutor(threading.Thread): def terminate(self): self.terminate() - - -from modules.util.log import LogFactory \ No newline at end of file
