diff options
| author | lovetox <philipp@hoerist.com> | 2020-03-20 18:15:11 +0300 |
|---|---|---|
| committer | lovetox <philipp@hoerist.com> | 2020-03-20 18:15:11 +0300 |
| commit | ceb541462ed855c6a389a96d51ab3151b23f0423 (patch) | |
| tree | 38e9785ddf2833855d6620e9feded942ff6516ad /nbxmpp | |
| parent | 847e21a4b26868363413ad43e12879f036161642 (diff) | |
Logging: Simplify passing context
Diffstat (limited to 'nbxmpp')
| -rw-r--r-- | nbxmpp/auth.py | 4 | ||||
| -rw-r--r-- | nbxmpp/client.py | 6 | ||||
| -rw-r--r-- | nbxmpp/dispatcher.py | 4 | ||||
| -rw-r--r-- | nbxmpp/smacks.py | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/nbxmpp/auth.py b/nbxmpp/auth.py index c145b6a..58ee874 100644 --- a/nbxmpp/auth.py +++ b/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): diff --git a/nbxmpp/client.py b/nbxmpp/client.py index 4312dda..115bdd7 100644 --- a/nbxmpp/client.py +++ b/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 diff --git a/nbxmpp/dispatcher.py b/nbxmpp/dispatcher.py index 73fca70..60fb373 100644 --- a/nbxmpp/dispatcher.py +++ b/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 = {} diff --git a/nbxmpp/smacks.py b/nbxmpp/smacks.py index f2f9efd..983b651 100644 --- a/nbxmpp/smacks.py +++ b/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() |