Logging fixes

* Remove misplaced basicConfig
* Use %-style string interpolation

Author: JacobHenner

kubernetes_asyncio/leaderelection/electionconfig.py

@@ -12,11 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
 from collections.abc import Coroutine  # noqa:F401
 
-logging.basicConfig(level=logging.INFO)
-
 
 class Config:
     # Validate config, exit if an error is detected

kubernetes_asyncio/leaderelection/leaderelection.py

@@ -22,7 +22,6 @@
 
 from .leaderelectionrecord import LeaderElectionRecord
 
-logging.basicConfig(level=logging.INFO)
 
 """
 This package implements leader election using an annotation in a Kubernetes
@@ -54,9 +53,7 @@ async def run(self):
         # Try to create/ acquire a lock
         if await self.acquire():
             logging.info(
-                "{} successfully acquired lease".format(
-                    self.election_config.lock.identity
-                )
+                "%s successfully acquired lease", self.election_config.lock.identity
             )
 
             task = asyncio.create_task(self.election_config.onstarted_leading)
@@ -76,7 +73,7 @@ async def run(self):
 
     async def acquire(self):
         # Follower
-        logging.info("{} is a follower".format(self.election_config.lock.identity))
+        logging.info("%s is a follower", self.election_config.lock.identity)
         retry_period = self.election_config.retry_period
 
         while True:
@@ -135,16 +132,14 @@ async def try_acquire_or_renew(self):
         if not lock_status:
             if json.loads(old_election_record.body)["code"] != HTTPStatus.NOT_FOUND:
                 logging.info(
-                    "Error retrieving resource lock {} as {}".format(
-                        self.election_config.lock.name, old_election_record.reason
-                    )
+                    "Error retrieving resource lock %s as %s",
+                    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
-                )
+                "%s is trying to create a lock",
+                leader_election_record.holder_identity,
             )
             create_status = await self.election_config.lock.create(
                 name=self.election_config.lock.name,
@@ -154,9 +149,7 @@ async def try_acquire_or_renew(self):
 
             if not create_status:
                 logging.info(
-                    "{} Failed to create lock".format(
-                        leader_election_record.holder_identity
-                    )
+                    "%s Failed to create lock", leader_election_record.holder_identity
                 )
                 return False
 
@@ -186,7 +179,7 @@ async def try_acquire_or_renew(self):
             != old_election_record.holder_identity
         ):
             logging.info(
-                "Leader has switched to {}".format(old_election_record.holder_identity)
+                "Leader has switched to %s", old_election_record.holder_identity
             )
 
         if (
@@ -204,9 +197,8 @@ async def try_acquire_or_renew(self):
             > int(now_timestamp * 1000)
         ):
             logging.info(
-                "yet to finish lease_duration, lease held by {} and has not expired".format(
-                    old_election_record.holder_identity
-                )
+                "yet to finish lease_duration, lease held by %s and has not expired",
+                old_election_record.holder_identity,
             )
             return False
 
@@ -227,17 +219,14 @@ async def update_lock(self, leader_election_record):
 
         if not update_status:
             logging.info(
-                "{} failed to acquire lease".format(
-                    leader_election_record.holder_identity
-                )
+                "%s failed to acquire lease", 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
-            )
+            "leader %s has successfully acquired lease",
+            leader_election_record.holder_identity,
         )
         return True

kubernetes_asyncio/leaderelection/resourcelock/configmaplock.py

@@ -20,8 +20,6 @@
 
 from ..leaderelectionrecord import LeaderElectionRecord
 
-logging.basicConfig(level=logging.INFO)
-
 
 class ConfigMapLock:
     def __init__(self, name, namespace, identity, api_client):
@@ -108,7 +106,7 @@ async def create(self, name, namespace, election_record):
             )
             return True
         except ApiException as e:
-            logging.info("Failed to create lock as {}".format(e))
+            logging.info("Failed to create lock as %s", e)
             return False
 
     async def update(self, name, namespace, updated_record):
@@ -128,7 +126,7 @@ async def update(self, name, namespace, updated_record):
             )
             return True
         except ApiException as e:
-            logging.info("Failed to update lock as {}".format(e))
+            logging.info("Failed to update lock as %s", e)
             return False
 
     def get_lock_object(self, lock_record):

kubernetes_asyncio/leaderelection/resourcelock/leaselock.py

@@ -20,8 +20,6 @@
 
 from ..leaderelectionrecord import LeaderElectionRecord
 
-logging.basicConfig(level=logging.INFO)
-
 
 class LeaseLock:
     def __init__(self, name, namespace, identity, api_client):
@@ -72,7 +70,7 @@ async def create(self, name, namespace, election_record):
             )
             return True
         except ApiException as e:
-            logging.info("Failed to create lock as {}".format(e))
+            logging.info("Failed to create lock as %s", e)
             return False
 
     async def update(self, name, namespace, updated_record):
@@ -93,7 +91,7 @@ async def update(self, name, namespace, updated_record):
             )
             return True
         except ApiException as e:
-            logging.info("Failed to update lock as {}".format(e))
+            logging.info("Failed to update lock as %s", e)
             return False
 
     def update_lease(self, leader_election_record, current_spec=None):
@@ -142,4 +140,4 @@ def time_str_to_iso(self, str_time):
                 return datetime.strptime(str_time, fmt).isoformat() + "Z"
             except ValueError:
                 pass
-        logging.error("Failed to parse time string: {}".format(str_time))
+        logging.error("Failed to parse time string: %s", str_time)