diff --git a/kubernetes/base/leaderelection/electionconfig.py b/kubernetes/base/leaderelection/electionconfig.py index 7b0db639b4..8ae8847e13 100644 --- a/kubernetes/base/leaderelection/electionconfig.py +++ b/kubernetes/base/leaderelection/electionconfig.py @@ -14,7 +14,7 @@ import sys import logging -logging.basicConfig(level=logging.INFO) +logger = logging.getLogger("leaderelection") class Config: @@ -56,4 +56,4 @@ def __init__(self, lock, lease_duration, renew_deadline, retry_period, onstarted # Default callback for when the current candidate if a leader, stops leading def on_stoppedleading_callback(self): - logging.info("stopped leading".format(self.lock.identity)) + logger.info("stopped leading".format(self.lock.identity)) diff --git a/kubernetes/base/leaderelection/leaderelection.py b/kubernetes/base/leaderelection/leaderelection.py index a707fbaccd..bbeb813505 100644 --- a/kubernetes/base/leaderelection/leaderelection.py +++ b/kubernetes/base/leaderelection/leaderelection.py @@ -24,7 +24,7 @@ from http import HTTPStatus else: import httplib -logging.basicConfig(level=logging.INFO) +logger = logging.getLogger("leaderelection") """ This package implements leader election using an annotation in a Kubernetes object. @@ -55,7 +55,7 @@ def __init__(self, election_config): def run(self): # Try to create/ acquire a lock if self.acquire(): - logging.info("{} successfully acquired lease".format(self.election_config.lock.identity)) + logger.info("{} successfully acquired lease".format(self.election_config.lock.identity)) # Start leading and call OnStartedLeading() threading.daemon = True @@ -68,7 +68,7 @@ def run(self): def acquire(self): # Follower - logging.info("{} is a follower".format(self.election_config.lock.identity)) + logger.info("{} is a follower".format(self.election_config.lock.identity)) retry_period = self.election_config.retry_period while True: @@ -81,7 +81,7 @@ def acquire(self): def renew_loop(self): # Leader - logging.info("Leader has entered renew loop and will try to update lease continuously") + logger.info("Leader has entered renew loop and will try to update lease continuously") retry_period = self.election_config.retry_period renew_deadline = self.election_config.renew_deadline * 1000 @@ -121,22 +121,22 @@ def try_acquire_or_renew(self): # To be removed when support for python2 will be removed if sys.version_info > (3, 0): if json.loads(old_election_record.body)['code'] != HTTPStatus.NOT_FOUND: - logging.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name, + logger.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name, old_election_record.reason)) return False else: if json.loads(old_election_record.body)['code'] != httplib.NOT_FOUND: - logging.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name, + logger.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name, old_election_record.reason)) return False - logging.info("{} is trying to create a lock".format(leader_election_record.holder_identity)) + logger.info("{} is trying to create a lock".format(leader_election_record.holder_identity)) create_status = self.election_config.lock.create(name=self.election_config.lock.name, namespace=self.election_config.lock.namespace, election_record=leader_election_record) if create_status is False: - logging.info("{} Failed to create lock".format(leader_election_record.holder_identity)) + logger.info("{} Failed to create lock".format(leader_election_record.holder_identity)) return False self.observed_record = leader_election_record @@ -156,7 +156,7 @@ def try_acquire_or_renew(self): # Report transitions if self.observed_record and self.observed_record.holder_identity != old_election_record.holder_identity: - logging.info("Leader has switched to {}".format(old_election_record.holder_identity)) + logger.info("Leader has switched to {}".format(old_election_record.holder_identity)) if self.observed_record is None or old_election_record.__dict__ != self.observed_record.__dict__: self.observed_record = old_election_record @@ -165,7 +165,7 @@ def try_acquire_or_renew(self): # If This candidate is not the leader and lease duration is yet to finish if (self.election_config.lock.identity != self.observed_record.holder_identity and self.observed_time_milliseconds + self.election_config.lease_duration * 1000 > int(now_timestamp * 1000)): - logging.info("yet to finish lease_duration, lease held by {} and has not expired".format(old_election_record.holder_identity)) + logger.info("yet to finish lease_duration, lease held by {} and has not expired".format(old_election_record.holder_identity)) return False # If this candidate is the Leader @@ -182,10 +182,10 @@ def update_lock(self, leader_election_record): leader_election_record) if update_status is False: - logging.info("{} failed to acquire lease".format(leader_election_record.holder_identity)) + logger.info("{} failed to acquire lease".format(leader_election_record.holder_identity)) return False self.observed_record = leader_election_record self.observed_time_milliseconds = int(time.time() * 1000) - logging.info("leader {} has successfully acquired lease".format(leader_election_record.holder_identity)) + logger.info("leader {} has successfully acquired lease".format(leader_election_record.holder_identity)) return True diff --git a/kubernetes/base/leaderelection/resourcelock/configmaplock.py b/kubernetes/base/leaderelection/resourcelock/configmaplock.py index a4ccf49d27..719152edea 100644 --- a/kubernetes/base/leaderelection/resourcelock/configmaplock.py +++ b/kubernetes/base/leaderelection/resourcelock/configmaplock.py @@ -18,7 +18,7 @@ from ..leaderelectionrecord import LeaderElectionRecord import json import logging -logging.basicConfig(level=logging.INFO) +logger = logging.getLogger("leaderelection") class ConfigMapLock: @@ -86,7 +86,7 @@ def create(self, name, namespace, election_record): api_response = self.api_instance.create_namespaced_config_map(namespace, body, pretty=True) return True except ApiException as e: - logging.info("Failed to create lock as {}".format(e)) + logger.info("Failed to create lock as {}".format(e)) return False def update(self, name, namespace, updated_record): @@ -103,7 +103,7 @@ def update(self, name, namespace, updated_record): body=self.configmap_reference) return True except ApiException as e: - logging.info("Failed to update lock as {}".format(e)) + logger.info("Failed to update lock as {}".format(e)) return False def get_lock_object(self, lock_record):