Skip to content

Commit be4072f

Browse files
committed
Use named logger for leader election
1 parent a49d85d commit be4072f

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

kubernetes/base/leaderelection/electionconfig.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import sys
1616
import logging
17-
logging.basicConfig(level=logging.INFO)
17+
logger = logging.getLogger("leaderelection")
1818

1919

2020
class Config:
@@ -56,4 +56,4 @@ def __init__(self, lock, lease_duration, renew_deadline, retry_period, onstarted
5656

5757
# Default callback for when the current candidate if a leader, stops leading
5858
def on_stoppedleading_callback(self):
59-
logging.info("stopped leading".format(self.lock.identity))
59+
logger.info("stopped leading".format(self.lock.identity))

kubernetes/base/leaderelection/leaderelection.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from http import HTTPStatus
2525
else:
2626
import httplib
27-
logging.basicConfig(level=logging.INFO)
27+
logger = logging.getLogger("leaderelection")
2828

2929
"""
3030
This package implements leader election using an annotation in a Kubernetes object.
@@ -55,7 +55,7 @@ def __init__(self, election_config):
5555
def run(self):
5656
# Try to create/ acquire a lock
5757
if self.acquire():
58-
logging.info("{} successfully acquired lease".format(self.election_config.lock.identity))
58+
logger.info("{} successfully acquired lease".format(self.election_config.lock.identity))
5959

6060
# Start leading and call OnStartedLeading()
6161
threading.daemon = True
@@ -68,7 +68,7 @@ def run(self):
6868

6969
def acquire(self):
7070
# Follower
71-
logging.info("{} is a follower".format(self.election_config.lock.identity))
71+
logger.info("{} is a follower".format(self.election_config.lock.identity))
7272
retry_period = self.election_config.retry_period
7373

7474
while True:
@@ -81,7 +81,7 @@ def acquire(self):
8181

8282
def renew_loop(self):
8383
# Leader
84-
logging.info("Leader has entered renew loop and will try to update lease continuously")
84+
logger.info("Leader has entered renew loop and will try to update lease continuously")
8585

8686
retry_period = self.election_config.retry_period
8787
renew_deadline = self.election_config.renew_deadline * 1000
@@ -121,22 +121,22 @@ def try_acquire_or_renew(self):
121121
# To be removed when support for python2 will be removed
122122
if sys.version_info > (3, 0):
123123
if json.loads(old_election_record.body)['code'] != HTTPStatus.NOT_FOUND:
124-
logging.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name,
124+
logger.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name,
125125
old_election_record.reason))
126126
return False
127127
else:
128128
if json.loads(old_election_record.body)['code'] != httplib.NOT_FOUND:
129-
logging.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name,
129+
logger.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name,
130130
old_election_record.reason))
131131
return False
132132

133-
logging.info("{} is trying to create a lock".format(leader_election_record.holder_identity))
133+
logger.info("{} is trying to create a lock".format(leader_election_record.holder_identity))
134134
create_status = self.election_config.lock.create(name=self.election_config.lock.name,
135135
namespace=self.election_config.lock.namespace,
136136
election_record=leader_election_record)
137137

138138
if create_status is False:
139-
logging.info("{} Failed to create lock".format(leader_election_record.holder_identity))
139+
logger.info("{} Failed to create lock".format(leader_election_record.holder_identity))
140140
return False
141141

142142
self.observed_record = leader_election_record
@@ -156,7 +156,7 @@ def try_acquire_or_renew(self):
156156

157157
# Report transitions
158158
if self.observed_record and self.observed_record.holder_identity != old_election_record.holder_identity:
159-
logging.info("Leader has switched to {}".format(old_election_record.holder_identity))
159+
logger.info("Leader has switched to {}".format(old_election_record.holder_identity))
160160

161161
if self.observed_record is None or old_election_record.__dict__ != self.observed_record.__dict__:
162162
self.observed_record = old_election_record
@@ -165,7 +165,7 @@ def try_acquire_or_renew(self):
165165
# If This candidate is not the leader and lease duration is yet to finish
166166
if (self.election_config.lock.identity != self.observed_record.holder_identity
167167
and self.observed_time_milliseconds + self.election_config.lease_duration * 1000 > int(now_timestamp * 1000)):
168-
logging.info("yet to finish lease_duration, lease held by {} and has not expired".format(old_election_record.holder_identity))
168+
logger.info("yet to finish lease_duration, lease held by {} and has not expired".format(old_election_record.holder_identity))
169169
return False
170170

171171
# If this candidate is the Leader
@@ -182,10 +182,10 @@ def update_lock(self, leader_election_record):
182182
leader_election_record)
183183

184184
if update_status is False:
185-
logging.info("{} failed to acquire lease".format(leader_election_record.holder_identity))
185+
logger.info("{} failed to acquire lease".format(leader_election_record.holder_identity))
186186
return False
187187

188188
self.observed_record = leader_election_record
189189
self.observed_time_milliseconds = int(time.time() * 1000)
190-
logging.info("leader {} has successfully acquired lease".format(leader_election_record.holder_identity))
190+
logger.info("leader {} has successfully acquired lease".format(leader_election_record.holder_identity))
191191
return True

kubernetes/base/leaderelection/resourcelock/configmaplock.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from ..leaderelectionrecord import LeaderElectionRecord
1919
import json
2020
import logging
21-
logging.basicConfig(level=logging.INFO)
21+
logger = logging.getLogger("leaderelection")
2222

2323

2424
class ConfigMapLock:
@@ -86,7 +86,7 @@ def create(self, name, namespace, election_record):
8686
api_response = self.api_instance.create_namespaced_config_map(namespace, body, pretty=True)
8787
return True
8888
except ApiException as e:
89-
logging.info("Failed to create lock as {}".format(e))
89+
logger.info("Failed to create lock as {}".format(e))
9090
return False
9191

9292
def update(self, name, namespace, updated_record):
@@ -103,7 +103,7 @@ def update(self, name, namespace, updated_record):
103103
body=self.configmap_reference)
104104
return True
105105
except ApiException as e:
106-
logging.info("Failed to update lock as {}".format(e))
106+
logger.info("Failed to update lock as {}".format(e))
107107
return False
108108

109109
def get_lock_object(self, lock_record):

0 commit comments

Comments
 (0)