Merge pull request CloudBotIRC#126 from linuxdaemon/gonzobot+requests-errors

Add more data for requests errors to chan_log

Author: edwardslabs

plugins/core/chan_log.py

@@ -1,13 +1,19 @@
 import traceback
 
-from requests import HTTPError
+from requests.exceptions import RequestException
 
 from cloudbot import hook
 from cloudbot.util import web
 
 
+def _dump_attrs(obj):
+    for name in dir(obj):
+        if not name.startswith('_'):
+            yield name, getattr(obj, name, None)
+
+
 @hook.post_hook
-def on_hook_end(error, launched_hook, launched_event, conn, admin_log):
+def on_hook_end(error, launched_hook, launched_event, admin_log):
     should_broadcast = True
     if error is not None:
         admin_log(
@@ -20,21 +26,25 @@ def on_hook_end(error, launched_hook, launched_event, conn, admin_log):
         url = web.paste('\n'.join(lines))
         admin_log("Traceback: " + url, should_broadcast)
 
-        event_data = launched_event.__dict__.items()
-        lines = ["{} = {}".format(k, v) for k, v in event_data]
-
-        if isinstance(error, HTTPError) and error.response is not None:
-            response = error.response
-            lines.append("")
-            lines.append("Request Info:")
-            data = (
-                ("URL", response.url),
-                ("Status", response.status_code),
-                ("Raw Content", response.content),
-            )
-            lines.extend(
-                "{} = {}".format(k, v) for k, v in data
-            )
+        lines = ["{} = {}".format(k, v) for k, v in _dump_attrs(launched_event)]
+        exc_type, exc, exc_tb = error
+
+        lines.append("")
+        lines.append("Error data:")
+        lines.extend("{} = {}".format(k, v) for k, v in _dump_attrs(exc))
+
+        if isinstance(exc, RequestException):
+            if exc.request is not None:
+                req = exc.request
+                lines.append("")
+                lines.append("Request Info:")
+                lines.extend("{} = {}".format(k, v) for k, v in _dump_attrs(req))
+
+            if exc.response is not None:
+                response = exc.response
+                lines.append("")
+                lines.append("Response Info:")
+                lines.extend("{} = {}".format(k, v) for k, v in _dump_attrs(response))
 
         url = web.paste('\n'.join(lines))
         admin_log("Event: " + url, should_broadcast)