directly pass exception instances as 'exc_info' logger argument

mikf · Sep 19, 2024 · a051e1c · a051e1c
1 parent dd56bb2
commit a051e1c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/gallery_dl/downloader/ytdl.py b/gallery_dl/downloader/ytdl.py
@@ -45,7 +45,7 @@ def download(self, url, pathfmt):
                 except (ImportError, SyntaxError) as exc:
                     self.log.error("Cannot import module '%s'",
                                    getattr(exc, "name", ""))
-                    self.log.debug("", exc_info=True)
+                    self.log.debug("", exc_info=exc)
                     self.download = lambda u, p: False
                     return False
                 self.ytdl_instance = ytdl_instance = ytdl.construct_YoutubeDL(
@@ -64,8 +64,8 @@ def download(self, url, pathfmt):
         if not info_dict:
             try:
                 info_dict = ytdl_instance.extract_info(url[5:], download=False)
-            except Exception:
-                pass
+            except Exception as exc:
+                self.log.debug("", exc_info=exc)
             if not info_dict:
                 return False
 
@@ -120,8 +120,8 @@ def _download_video(self, ytdl_instance, pathfmt, info_dict):
         self.out.start(pathfmt.path)
         try:
             ytdl_instance.process_info(info_dict)
-        except Exception:
-            self.log.debug("Traceback", exc_info=True)
+        except Exception as exc:
+            self.log.debug("", exc_info=exc)
             return False
         return True
 

diff --git a/gallery_dl/extractor/8chan.py b/gallery_dl/extractor/8chan.py
@@ -79,7 +79,7 @@ def items(self):
             self.cookies = self.cookies_prepare()
         except Exception as exc:
             self.log.debug("Failed to fetch captcha cookies:  %s: %s",
-                           exc.__class__.__name__, exc, exc_info=True)
+                           exc.__class__.__name__, exc, exc_info=exc)
 
         # download files
         posts = thread.pop("posts", ())

diff --git a/gallery_dl/extractor/flickr.py b/gallery_dl/extractor/flickr.py
@@ -37,11 +37,13 @@ def items(self):
         extract = self.api._extract_format
         for photo in self.photos():
             try:
+                1/0
                 photo = extract(photo)
             except Exception as exc:
                 self.log.warning(
-                    "Skipping %s (%s)", photo["id"], exc.__class__.__name__)
-                self.log.debug("", exc_info=True)
+                    "Skipping photo %s (%s: %s)",
+                    photo["id"], exc.__class__.__name__, exc)
+                self.log.debug("", exc_info=exc)
             else:
                 photo.update(data)
                 url = photo["url"]

diff --git a/gallery_dl/extractor/newgrounds.py b/gallery_dl/extractor/newgrounds.py
@@ -53,8 +53,8 @@ def items(self):
             try:
                 post = self.extract_post(post_url)
                 url = post.get("url")
-            except Exception:
-                self.log.debug("", exc_info=True)
+            except Exception as exc:
+                self.log.debug("", exc_info=exc)
                 url = None
 
             if url:

diff --git a/gallery_dl/job.py b/gallery_dl/job.py
@@ -158,20 +158,20 @@ def run(self):
             raise
         except exception.GalleryDLException as exc:
             log.error("%s: %s", exc.__class__.__name__, exc)
-            log.debug("", exc_info=True)
+            log.debug("", exc_info=exc)
             self.status |= exc.code
         except OSError as exc:
             log.error("Unable to download data:  %s: %s",
                       exc.__class__.__name__, exc)
-            log.debug("", exc_info=True)
+            log.debug("", exc_info=exc)
             self.status |= 128
         except Exception as exc:
             log.error(("An unexpected error occurred: %s - %s. "
                        "Please run gallery-dl again with the --verbose flag, "
                        "copy its output and report this issue on "
                        "https://github.com/mikf/gallery-dl/issues ."),
                       exc.__class__.__name__, exc)
-            log.debug("", exc_info=True)
+            log.debug("", exc_info=exc)
             self.status |= 1
         except BaseException:
             self.status |= 1
@@ -642,7 +642,7 @@ def initialize(self, kwdict=None):
                 except Exception as exc:
                     pp_log.error("'%s' initialization failed:  %s: %s",
                                  name, exc.__class__.__name__, exc)
-                    pp_log.debug("", exc_info=True)
+                    pp_log.debug("", exc_info=exc)
                 else:
                     pp_list.append(pp_obj)
 

diff --git a/gallery_dl/postprocessor/ugoira.py b/gallery_dl/postprocessor/ugoira.py
@@ -223,11 +223,12 @@ def convert_to_animation(self, pathfmt, tempdir):
             print()
             self.log.error("Unable to invoke FFmpeg (%s: %s)",
                            exc.__class__.__name__, exc)
+            self.log.debug("", exc_info=exc)
             pathfmt.realpath = pathfmt.temppath
         except Exception as exc:
             print()
             self.log.error("%s: %s", exc.__class__.__name__, exc)
-            self.log.debug("", exc_info=True)
+            self.log.debug("", exc_info=exc)
             pathfmt.realpath = pathfmt.temppath
         else:
             if self.mtime: