Merge pull request #1078 from closeio/andrzej/p3/fix-ruff-g201

neob91-close · web-flow · commit 57be4aa35a03 · 2025-08-18T16:39:45.000+02:00
Fix ruff `G201` error
diff --git a/inbox/api/metrics_api.py b/inbox/api/metrics_api.py
@@ -256,10 +256,9 @@ def index():  # type: ignore[no-untyped-def]  # noqa: ANN201
                     }
                 )
             except Exception:
-                log.error(  # noqa: G201
+                log.exception(
                     "Error while serializing account metrics",
                     account_id=account.id,
-                    exc_info=True,
                 )
 
         return APIEncoder().jsonify(data)
diff --git a/inbox/api/ns_api.py b/inbox/api/ns_api.py
@@ -265,7 +265,7 @@ def handle_operational_error(error):  # type: ignore[no-untyped-def]  # noqa: AN
     else:
         message = "A temporary database error prevented us from serving this request. Please try again."
 
-    log.error("MySQL OperationalError", exc_info=True)
+    log.exception("MySQL OperationalError")
     response = flask_jsonify(message=message, type="database_error")
     response.status_code = 503
     return response
diff --git a/inbox/events/recurring.py b/inbox/events/recurring.py
@@ -88,13 +88,8 @@ def parse_rrule(event):  # type: ignore[no-untyped-def]  # noqa: ANN201
             )
 
             return rule
-        except Exception as e:
-            log.error(  # noqa: G201
-                "Error parsing RRULE entry",
-                event_id=event.id,
-                error=e,
-                exc_info=True,
-            )
+        except Exception:
+            log.exception("Error parsing RRULE entry", event_id=event.id)
     return None
 
 
diff --git a/inbox/heartbeat/store.py b/inbox/heartbeat/store.py
@@ -17,9 +17,7 @@ def wrapper(*args, **kwargs):  # type: ignore[no-untyped-def]
         try:
             return f(*args, **kwargs)
         except Exception:
-            log.error(  # noqa: G201
-                "Error interacting with heartbeats", exc_info=True
-            )
+            log.exception("Error interacting with heartbeats")
 
     return wrapper
 
@@ -87,12 +85,11 @@ def publish(self, **kwargs) -> None:  # type: ignore[no-untyped-def]
             self.store.publish(self.key, self.heartbeat_at)
         except Exception:
             log = get_logger()
-            log.error(  # noqa: G201
+            log.exception(
                 "Error while writing the heartbeat status",
                 account_id=self.key.account_id,
                 folder_id=self.key.folder_id,
                 device_id=self.device_id,
-                exc_info=True,
             )
 
     @safe_failure
diff --git a/inbox/mailsync/service.py b/inbox/mailsync/service.py
@@ -392,8 +392,8 @@ def start_sync(self, account_id: int) -> bool:
                     sync_host=account.sync_host,
                 )
             except Exception:
-                self.log.error(  # noqa: G201
-                    "Error starting sync", exc_info=True, account_id=account_id
+                self.log.exception(
+                    "Error starting sync", account_id=account_id
                 )
                 return False
         return True
diff --git a/inbox/models/event.py b/inbox/models/event.py
@@ -509,26 +509,16 @@ def __init__(self, **kwargs) -> None:  # type: ignore[no-untyped-def]
         super().__init__(**kwargs)
         try:
             self.unwrap_rrule()
-        except Exception as e:
-            log.error(  # noqa: G201
-                "Error parsing RRULE entry",
-                event_id=self.id,
-                error=e,
-                exc_info=True,
-            )
+        except Exception:
+            log.exception("Error parsing RRULE entry", event_id=self.id)
 
     # FIXME @karim: use an overrided property instead of a reconstructor.
     @reconstructor
     def reconstruct(self) -> None:
         try:
             self.unwrap_rrule()
-        except Exception as e:
-            log.error(  # noqa: G201
-                "Error parsing stored RRULE entry",
-                event_id=self.id,
-                error=e,
-                exc_info=True,
-            )
+        except Exception:
+            log.exception("Error parsing stored RRULE entry", event_id=self.id)
 
     def inflate(self, start=None, end=None):  # type: ignore[no-untyped-def]  # noqa: ANN201
         # Convert a RecurringEvent into a series of InflatedEvents
diff --git a/inbox/models/message.py b/inbox/models/message.py
@@ -708,10 +708,8 @@ def calculate_html_snippet(self, text: str) -> str:
         try:
             text = strip_tags(text)
         except HTMLParseError:
-            log.error(  # noqa: G201
-                "error stripping tags",
-                message_nylas_uid=self.nylas_uid,
-                exc_info=True,
+            log.exception(
+                "error stripping tags", message_nylas_uid=self.nylas_uid
             )
             text = ""
 
diff --git a/inbox/s3/backends/imap.py b/inbox/s3/backends/imap.py
@@ -23,9 +23,8 @@ def get_imap_raw_contents(message):  # type: ignore[no-untyped-def]  # noqa: ANN
         try:
             crispin_client.select_folder(folder.name, uidvalidity_cb)
         except FolderMissingError as exc:
-            log.error(  # noqa: G201
+            log.exception(
                 "Error while fetching raw contents: can't find folder",
-                exc_info=True,
                 logstash_tag="fetching_error",
             )
             raise EmailFetchException(
@@ -42,9 +41,8 @@ def get_imap_raw_contents(message):  # type: ignore[no-untyped-def]  # noqa: ANN
 
             return uids[0].body
         except imapclient.IMAPClient.Error:
-            log.error(  # noqa: G201
+            log.exception(
                 "Error while fetching raw contents",
-                exc_info=True,
                 logstash_tag="fetching_error",
             )
             raise EmailFetchException(  # noqa: B904
diff --git a/inbox/search/backends/imap.py b/inbox/search/backends/imap.py
@@ -233,9 +233,8 @@ def _search_folder(  # type: ignore[no-untyped-def]
             self.log.warning("Won't search missing IMAP folder", exc_info=True)
             return []
         except UidInvalid:
-            self.log.error(  # noqa: G201
-                ("Got Uidvalidity error when searching. Skipping."),
-                exc_info=True,
+            self.log.exception(
+                "Got Uidvalidity error when searching. Skipping."
             )
             return []
 
diff --git a/inbox/sendmail/smtp/postel.py b/inbox/sendmail/smtp/postel.py
@@ -161,9 +161,7 @@ def _connect(self, host, port):  # type: ignore[no-untyped-def]
             self.connection.connect(host, port)
         except OSError as e:
             # 'Connection refused', SSL errors for non-TLS connections, etc.
-            log.error(  # noqa: G201
-                "SMTP connection error", exc_info=True, server_error=e.strerror
-            )
+            log.exception("SMTP connection error")
             msg = _transform_ssl_error(e.strerror)
             raise SendMailException(msg, 503)  # noqa: B904
 
@@ -364,9 +362,7 @@ def _send(self, recipients, msg):  # type: ignore[no-untyped-def]
                         )
             except smtplib.SMTPException as err:
                 last_error = err
-                self.log.error(  # noqa: G201
-                    "Error sending", error=err, exc_info=True
-                )
+                self.log.exception("Error sending")
 
         assert last_error is not None
         self.log.error(
diff --git a/inbox/sync/base_sync.py b/inbox/sync/base_sync.py
@@ -74,9 +74,8 @@ def _run(self) -> None:
                 )
         except ValidationError:
             # Bad account credentials; exit.
-            self.log.error(  # noqa: G201
+            self.log.exception(
                 "Credential validation error; exiting",
-                exc_info=True,
                 logstash_tag="mark_invalid",
             )
             with session_scope(self.namespace_id) as db_session:
@@ -93,7 +92,7 @@ def _run_impl(self) -> None:
         # If we get a connection or API permissions error, then sleep
         # 2x poll frequency.
         except ConnectionError:
-            self.log.error("Error while polling", exc_info=True)  # noqa: G201
+            self.log.exception("Error while polling")
             interruptible_threading.sleep(
                 introduce_jitter(self.poll_frequency)
             )
diff --git a/inbox/transactions/actions.py b/inbox/transactions/actions.py
@@ -884,9 +884,8 @@ def _run(self) -> None:
                 ):
                     task.execute()
             except Exception:
-                self.log.error(  # noqa: G201
+                self.log.exception(
                     "SyncbackWorker caught exception",
-                    exc_info=True,
                     account_id=task.account_id,
                 )
             finally:
diff --git a/tests/api/test_metrics_api.py b/tests/api/test_metrics_api.py
@@ -92,7 +92,7 @@ def test_metrics_index_busted_account(
 
     # outlook_account gets error
     ((method, (message,), kwargs),) = log_mock.method_calls
-    assert method == "error"
+    assert method == "exception"
     assert message == "Error while serializing account metrics"
     assert kwargs["account_id"] == outlook_account.id
 

Original file line number	Diff line number	Diff line change
`@@ -256,10 +256,9 @@ def index(): # type: ignore[no-untyped-def] # noqa: ANN201`
`256`	`256`	`}`
`257`	`257`	`)`
`258`	`258`	`except Exception:`
`259`		`- log.error( # noqa: G201`
	`259`	`+ log.exception(`
`260`	`260`	`"Error while serializing account metrics",`
`261`	`261`	`account_id=account.id,`
`262`		`- exc_info=True,`
`263`	`262`	`)`
`264`	`263`
`265`	`264`	`return APIEncoder().jsonify(data)`
Original file line number	Diff line number	Diff line change
`@@ -392,8 +392,8 @@ def start_sync(self, account_id: int) -> bool:`
`392`	`392`	`sync_host=account.sync_host,`
`393`	`393`	`)`
`394`	`394`	`except Exception:`
`395`		`- self.log.error( # noqa: G201`
`396`		`- "Error starting sync", exc_info=True, account_id=account_id`
	`395`	`+ self.log.exception(`
	`396`	`+ "Error starting sync", account_id=account_id`
`397`	`397`	`)`
`398`	`398`	`return False`
`399`	`399`	`return True`