From 71d5d364410984f955e78b47b670f248c0021471 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Mon, 6 Jun 2022 21:07:58 -0400 Subject: [PATCH 1/3] Pin adafruit_logging version --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0d54e86..574db5f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ Adafruit-Blinka Adafruit-CircuitPython-miniMQTT -Adafruit-CircuitPython-Logging +Adafruit-CircuitPython-Logging>=4.0.1 Adafruit-CircuitPython-Requests Adafruit-CircuitPython-Binascii diff --git a/setup.py b/setup.py index fa17c8b..98ce759 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ install_requires=[ "Adafruit-Blinka", "Adafruit-CircuitPython-miniMQTT", - "Adafruit-CircuitPython-Logging", + "Adafruit-CircuitPython-Logging>=4.0.1", "Adafruit-CircuitPython-Requests", "Adafruit-CircuitPython-Binascii", ], From 6eae9f5a057e8ed930e73a5873a7bc4d0079bc18 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Mon, 6 Jun 2022 22:05:05 -0400 Subject: [PATCH 2/3] Add stream handlers to loggers --- adafruit_azureiot/device_registration.py | 7 ++++++- adafruit_azureiot/iot_mqtt.py | 6 +++++- adafruit_azureiot/iotcentral_device.py | 6 +++++- adafruit_azureiot/iothub_device.py | 7 +++++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/adafruit_azureiot/device_registration.py b/adafruit_azureiot/device_registration.py index 948679c..93c7133 100644 --- a/adafruit_azureiot/device_registration.py +++ b/adafruit_azureiot/device_registration.py @@ -63,7 +63,12 @@ def __init__( self._id_scope = id_scope self._device_id = device_id self._device_sas_key = device_sas_key - self._logger = logger if logger is not None else logging.getLogger("log") + if logger is not None: + self._logger = logger + else: + self._logger = logging.getLogger("log") + self._logger.addHandler(logging.StreamHandler()) + self._mqtt = None self._auth_response_received = False diff --git a/adafruit_azureiot/iot_mqtt.py b/adafruit_azureiot/iot_mqtt.py index 10ba960..fa7fa84 100644 --- a/adafruit_azureiot/iot_mqtt.py +++ b/adafruit_azureiot/iot_mqtt.py @@ -353,7 +353,11 @@ def __init__( self._hostname, device_id, constants.IOTC_API_VERSION ) self._passwd = self._gen_sas_token() - self._logger = logger if logger is not None else logging.getLogger("log") + if logger is not None: + self._logger = logger + else: + self._logger = logging.getLogger("log") + self._logger.addHandler(logging.StreamHandler()) self._is_subscribed_to_twins = False def _subscribe_to_core_topics(self): diff --git a/adafruit_azureiot/iotcentral_device.py b/adafruit_azureiot/iotcentral_device.py index 53fbf51..ae54244 100644 --- a/adafruit_azureiot/iotcentral_device.py +++ b/adafruit_azureiot/iotcentral_device.py @@ -111,7 +111,11 @@ def __init__( self._device_id = device_id self._device_sas_key = device_sas_key self._token_expires = token_expires - self._logger = logger if logger is not None else logging.getLogger("log") + if logger is not None: + self._logger = logger + else: + self._logger = logging.getLogger("log") + self._logger.addHandler(logging.StreamHandler()) self._device_registration = None self._mqtt = None diff --git a/adafruit_azureiot/iothub_device.py b/adafruit_azureiot/iothub_device.py index e4f0410..dfa66b0 100755 --- a/adafruit_azureiot/iothub_device.py +++ b/adafruit_azureiot/iothub_device.py @@ -154,8 +154,11 @@ def __init__( self._socket = socket self._iface = iface self._token_expires = token_expires - self._logger = logger if logger is not None else logging.getLogger("log") - + if logger is not None: + self._logger = logger + else: + self._logger = logging.getLogger("log") + self._logger.addHandler(logging.StreamHandler()) connection_string_values = {} try: From 603d269c6d9bd6fe8a79538e333f21ac439a2ae3 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Mon, 6 Jun 2022 22:05:27 -0400 Subject: [PATCH 3/3] Reformatted per pre-commit --- adafruit_azureiot/device_registration.py | 1 - 1 file changed, 1 deletion(-) diff --git a/adafruit_azureiot/device_registration.py b/adafruit_azureiot/device_registration.py index 93c7133..21d3464 100644 --- a/adafruit_azureiot/device_registration.py +++ b/adafruit_azureiot/device_registration.py @@ -68,7 +68,6 @@ def __init__( else: self._logger = logging.getLogger("log") self._logger.addHandler(logging.StreamHandler()) - self._mqtt = None self._auth_response_received = False