Skip to content

Commit 76fd525

Browse files
committed
Cleanup debug logs, keep some useful ones
1 parent 0b6e9c7 commit 76fd525

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

juju/client/connection.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,6 @@ async def close(self, to_reconnect=False):
454454
self._debug_log_task.cancel()
455455

456456
if self._ws and not self._ws.closed:
457-
log.debug('close: calling websocket.close()')
458457
await self._ws.close()
459458

460459
if not to_reconnect:
@@ -465,7 +464,6 @@ async def close(self, to_reconnect=False):
465464
pass
466465
except websockets.exceptions.ConnectionClosed:
467466
pass
468-
log.debug('close: all tasks are done')
469467

470468
self._pinger_task = None
471469
self._receiver_task = None
@@ -598,7 +596,6 @@ async def _receiver(self):
598596
raise
599597

600598
async def _pinger(self):
601-
log.warning('Pinger: Starting')
602599
'''
603600
A Controller can time us out if we are silent for too long. This
604601
is especially true in JaaS, which has a fairly strict timeout.
@@ -802,7 +799,7 @@ async def reconnect(self):
802799
if not self.is_debug_log_connection:
803800
self._build_facades(res.get('facades', {}))
804801
if not self._pinger_task:
805-
log.debug('reconnect: creating pinger task')
802+
log.debug('reconnect: scheduling a pinger task')
806803
self._pinger_task = jasyncio.create_task(self._pinger(), name="Task_Pinger")
807804

808805
async def _connect(self, endpoints):
@@ -859,7 +856,7 @@ async def _try_endpoint(endpoint, cacert, delay):
859856
# If this is regular connection, and we dont have a
860857
# receiver_task yet, then schedule a _receiver_task
861858
elif not self.is_debug_log_connection and not self._receiver_task:
862-
log.debug('_connect: creating receiver task')
859+
log.debug('_connect: scheduling a receiver task')
863860
self._receiver_task = jasyncio.create_task(self._receiver(), name="Task_Receiver")
864861

865862
log.debug("Driver connected to juju %s", self.addr)
@@ -915,7 +912,7 @@ async def _connect_with_redirect(self, endpoints):
915912
login_result = await self._connect_with_login(e.endpoints)
916913
self._build_facades(login_result.get('facades', {}))
917914
if not self._pinger_task:
918-
log.debug('_connect_with_redirect: creating pinger task')
915+
log.debug('_connect_with_redirect: scheduling a pinger task')
919916
self._pinger_task = jasyncio.create_task(self._pinger(), name="Task_Pinger")
920917

921918
# _build_facades takes the facade list that comes from the connection with the controller,

juju/client/connector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ async def disconnect(self, entity):
9494
"""Shut down the watcher task and close websockets.
9595
"""
9696
if self._connection:
97-
log.debug(f'Closing {entity} connection')
97+
log.debug(f'Connector: closing {entity} connection')
9898
await self._connection.close()
9999
self._connection = None
100100
if self._log_connection:

0 commit comments

Comments
 (0)