Skip to content

Commit 2cbbed5

Browse files
authored
chore: Edit logger.error calls (#1019)
* Edit logger.errors that don't need to be called as errors to warning or debug
1 parent 268d4b3 commit 2cbbed5

File tree

6 files changed

+37
-33
lines changed

6 files changed

+37
-33
lines changed

azure-iot-device/azure/iot/device/common/handle_exceptions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def handle_background_exception(e):
2525

2626
# @FUTURE: We should add a mechanism which allows applications to receive these
2727
# exceptions so they can respond accordingly
28-
logger.error(msg="Exception caught in background thread. Unable to handle.")
29-
logger.error(traceback.format_exception_only(type(e), e))
28+
logger.warning(msg="Exception caught in background thread. Unable to handle.")
29+
logger.warning(traceback.format_exception_only(type(e), e))
3030

3131

3232
def swallow_unraised_exception(e, log_msg=None, log_lvl="warning"):

azure-iot-device/azure/iot/device/common/mqtt_transport.py

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -182,20 +182,22 @@ def on_connect(client, userdata, flags, rc):
182182
_create_error_from_connack_rc_code(rc)
183183
)
184184
except Exception:
185-
logger.error("Unexpected error calling on_mqtt_connection_failure_handler")
186-
logger.error(traceback.format_exc())
185+
logger.warning(
186+
"Unexpected error calling on_mqtt_connection_failure_handler"
187+
)
188+
logger.warning(traceback.format_exc())
187189
else:
188-
logger.error(
190+
logger.warning(
189191
"connection failed, but no on_mqtt_connection_failure_handler handler callback provided"
190192
)
191193
elif this.on_mqtt_connected_handler:
192194
try:
193195
this.on_mqtt_connected_handler()
194196
except Exception:
195-
logger.error("Unexpected error calling on_mqtt_connected_handler")
196-
logger.error(traceback.format_exc())
197+
logger.warning("Unexpected error calling on_mqtt_connected_handler")
198+
logger.warning(traceback.format_exc())
197199
else:
198-
logger.error("No event handler callback set for on_mqtt_connected_handler")
200+
logger.debug("No event handler callback set for on_mqtt_connected_handler")
199201

200202
def on_disconnect(client, userdata, rc):
201203
this = self_weakref()
@@ -220,10 +222,10 @@ def on_disconnect(client, userdata, rc):
220222
try:
221223
this.on_mqtt_disconnected_handler(cause)
222224
except Exception:
223-
logger.error("Unexpected error calling on_mqtt_disconnected_handler")
224-
logger.error(traceback.format_exc())
225+
logger.warning("Unexpected error calling on_mqtt_disconnected_handler")
226+
logger.warning(traceback.format_exc())
225227
else:
226-
logger.error("No event handler callback set for on_mqtt_disconnected_handler")
228+
logger.warning("No event handler callback set for on_mqtt_disconnected_handler")
227229

228230
def on_subscribe(client, userdata, mid, granted_qos):
229231
this = self_weakref()
@@ -254,10 +256,10 @@ def on_message(client, userdata, mqtt_message):
254256
try:
255257
this.on_mqtt_message_received_handler(mqtt_message.topic, mqtt_message.payload)
256258
except Exception:
257-
logger.error("Unexpected error calling on_mqtt_message_received_handler")
258-
logger.error(traceback.format_exc())
259+
logger.warning("Unexpected error calling on_mqtt_message_received_handler")
260+
logger.warning(traceback.format_exc())
259261
else:
260-
logger.error(
262+
logger.debug(
261263
"No event handler callback set for on_mqtt_message_received_handler - DROPPING MESSAGE"
262264
)
263265

@@ -601,8 +603,8 @@ def establish_operation(self, mid, callback=None):
601603
try:
602604
callback()
603605
except Exception:
604-
logger.error("Unexpected error calling callback for MID: {}".format(mid))
605-
logger.error(traceback.format_exc())
606+
logger.debug("Unexpected error calling callback for MID: {}".format(mid))
607+
logger.debug(traceback.format_exc())
606608
else:
607609
# Not entirely unexpected because of QOS=1
608610
logger.debug("No callback for MID: {}".format(mid))
@@ -644,8 +646,8 @@ def complete_operation(self, mid):
644646
try:
645647
callback()
646648
except Exception:
647-
logger.error("Unexpected error calling callback for MID: {}".format(mid))
648-
logger.error(traceback.format_exc())
649+
logger.debug("Unexpected error calling callback for MID: {}".format(mid))
650+
logger.debug(traceback.format_exc())
649651
else:
650652
# fully expected. QOS=1 means we might get 2 PUBACKs
651653
logger.debug("No callback set for MID: {}".format(mid))
@@ -674,7 +676,7 @@ def cancel_all_operations(self):
674676
try:
675677
callback(cancelled=True)
676678
except Exception:
677-
logger.error("Unexpected error calling callback for MID: {}".format(mid))
678-
logger.error(traceback.format_exc())
679+
logger.debug("Unexpected error calling callback for MID: {}".format(mid))
680+
logger.debug(traceback.format_exc())
679681
else:
680682
logger.debug("Cancelling {} - No callback set for MID".format(mid))

azure-iot-device/azure/iot/device/common/pipeline/pipeline_stages_base.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,16 @@ def handle_pipeline_event(self, event):
149149
except Exception as e:
150150
# Do not use exc_info parameter on logger.* calls. This causes pytest to save the
151151
# traceback which saves stack frames which shows up as a leak
152-
logger.error(
152+
logger.warning(
153153
msg="{}: Unexpected error in ._handle_pipeline_event() call: {}".format(self, e)
154154
)
155155
if self.previous:
156-
logger.error("{}: Raising background exception")
156+
logger.warning("{}: Raising background exception")
157157
self.report_background_exception(e)
158158
else:
159159
# Nothing else we can do but log this. There exists no stage we can send the
160160
# exception to, and raising would send the error back down the pipeline.
161-
logger.error(
161+
logger.warning(
162162
"{}: Cannot report a background exception because there is no previous stage!"
163163
)
164164

@@ -187,7 +187,7 @@ def send_op_down(self, op):
187187
self.next.run_op(op)
188188
else:
189189
# This shouldn't happen if the pipeline was created correctly
190-
logger.error(
190+
logger.warning(
191191
"{}({}): no next stage.cannot send op down. completing with error".format(
192192
self.name, op.name
193193
)
@@ -344,7 +344,7 @@ def _handle_pipeline_event(self, event):
344344
)
345345
else:
346346
# unexpected condition: we should be handling all pipeline events
347-
logger.error("incoming {} event with no handler. dropping.".format(event.name))
347+
logger.debug("incoming {} event with no handler. dropping.".format(event.name))
348348

349349

350350
# NOTE: This stage could be a candidate for being refactored into some kind of other

azure-iot-device/azure/iot/device/iothub/pipeline/mqtt_pipeline.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,28 +121,28 @@ def _on_pipeline_event(event):
121121
if self.on_c2d_message_received:
122122
self.on_c2d_message_received(event.message)
123123
else:
124-
logger.error("C2D message event received with no handler. dropping.")
124+
logger.debug("C2D message event received with no handler. dropping.")
125125

126126
elif isinstance(event, pipeline_events_iothub.InputMessageEvent):
127127
if self.on_input_message_received:
128128
self.on_input_message_received(event.message)
129129
else:
130-
logger.error("input message event received with no handler. dropping.")
130+
logger.debug("input message event received with no handler. dropping.")
131131

132132
elif isinstance(event, pipeline_events_iothub.MethodRequestEvent):
133133
if self.on_method_request_received:
134134
self.on_method_request_received(event.method_request)
135135
else:
136-
logger.error("Method request event received with no handler. Dropping.")
136+
logger.debug("Method request event received with no handler. Dropping.")
137137

138138
elif isinstance(event, pipeline_events_iothub.TwinDesiredPropertiesPatchEvent):
139139
if self.on_twin_patch_received:
140140
self.on_twin_patch_received(event.patch)
141141
else:
142-
logger.error("Twin patch event received with no handler. Dropping.")
142+
logger.debug("Twin patch event received with no handler. Dropping.")
143143

144144
else:
145-
logger.error("Dropping unknown pipeline event {}".format(event.name))
145+
logger.debug("Dropping unknown pipeline event {}".format(event.name))
146146

147147
def _on_connected():
148148
if self.on_connected:
@@ -515,7 +515,9 @@ def enable_feature(self, feature_name, callback):
515515

516516
def on_complete(op, error):
517517
if error:
518-
logger.error("Subscribe for {} failed. Not enabling feature".format(feature_name))
518+
logger.warning(
519+
"Subscribe for {} failed. Not enabling feature".format(feature_name)
520+
)
519521
else:
520522
self.feature_enabled[feature_name] = True
521523
callback(error=error)

azure-iot-device/azure/iot/device/iothub/pipeline/pipeline_stages_iothub_mqtt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def _get_feature_subscription_topic(self, feature):
168168
elif feature == pipeline_constant.TWIN_PATCHES:
169169
return mqtt_topic_iothub.get_twin_patch_topic_for_subscribe()
170170
else:
171-
logger.error("Cannot retrieve MQTT topic for subscription to invalid feature")
171+
logger.warning("Cannot retrieve MQTT topic for subscription to invalid feature")
172172
raise pipeline_exceptions.OperationError(
173173
"Trying to enable/disable invalid feature - {}".format(feature)
174174
)

azure-iot-device/azure/iot/device/provisioning/pipeline/mqtt_pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def __init__(self, pipeline_configuration):
104104

105105
def _on_pipeline_event(event):
106106
# error because no events should
107-
logger.error("Dropping unknown pipeline event {}".format(event.name))
107+
logger.debug("Dropping unknown pipeline event {}".format(event.name))
108108

109109
def _on_connected():
110110
if self.on_connected:

0 commit comments

Comments
 (0)