Philipp Hörist pushed to branch master at gajim / python-nbxmpp

Commits: ceb54146 by lovetox at 2020-03-20T16:15:11+01:00 Logging: Simplify passing context

- - - - -

4 changed files:

- nbxmpp/auth.py - nbxmpp/client.py - nbxmpp/dispatcher.py - nbxmpp/smacks.py

Changes:

===================================== nbxmpp/auth.py ===================================== @@ -46,7 +46,7 @@ class SASL: """ Implements SASL authentication. """ - def __init__(self, client, log_context): + def __init__(self, client): self._client = client

self._password = None @@ -56,7 +56,7 @@ class SASL: self._method = None self._error = None

- self._log = LogAdapter(log, {'context': log_context}) + self._log = LogAdapter(log, {'context': client.log_context})

@property def error(self):

===================================== nbxmpp/client.py ===================================== @@ -117,13 +117,13 @@ class Client(Observable):

self._ping_source_id = None

- self._dispatcher = StanzaDispatcher(self, self._log_context) + self._dispatcher = StanzaDispatcher(self) self._dispatcher.subscribe('before-dispatch', self._on_before_dispatch) self._dispatcher.subscribe('parsing-error', self._on_parsing_error) self._dispatcher.subscribe('stream-end', self._on_stream_end)

- self._smacks = Smacks(self, self._log_context) - self._sasl = SASL(self, self._log_context) + self._smacks = Smacks(self) + self._sasl = SASL(self)

self._state = StreamState.DISCONNECTED

===================================== nbxmpp/dispatcher.py ===================================== @@ -101,14 +101,14 @@ class StanzaDispatcher(Observable):

"""

- def __init__(self, client, log_context): + def __init__(self, client): Observable.__init__(self, log) self._client = client self._modules = {} self._parser = None self._websocket_stream_error = None

- self._log = LogAdapter(log, {'context': log_context}) + self._log = LogAdapter(log, {'context': client.log_context})

self._handlers = {}

===================================== nbxmpp/smacks.py ===================================== @@ -37,7 +37,7 @@ class Smacks: number of handled stanzas """

- def __init__(self, client, log_context): + def __init__(self, client): self._client = client self._out_h = 0 # Outgoing stanzas handled self._in_h = 0 # Incoming stanzas handled @@ -59,7 +59,7 @@ class Smacks: self._session_id = None self._location = None

- self._log = LogAdapter(log, {'context': log_context}) + self._log = LogAdapter(log, {'context': client.log_context})

self.register_handlers()

View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ceb541462ed855c6a389a96d5...