configure root logger

Author: Kareem Zidane

Diff for: src/cs50/cs50.py

@@ -1,6 +1,7 @@
 from __future__ import print_function
 
 import inspect
+import logging
 import os
 import re
 import sys
@@ -11,6 +12,13 @@
 from traceback import format_exception
 
 
+# Configure default logging handler and formatter
+logging.basicConfig(format="%(levelname)s: %(message)s", level=logging.DEBUG)
+
+# Patch formatException
+logging.root.handlers[0].formatter.formatException = lambda exc_info: _formatException(*exc_info)
+
+
 class _flushfile():
     """
     Disable buffering for standard output and standard error.

Diff for: src/cs50/flask.py

@@ -12,8 +12,6 @@ def _wrap_flask(f):
     if f.__version__ < StrictVersion("1.0"):
         return
 
-    f.logging.default_handler.formatter.formatException = lambda exc_info: _formatException(*exc_info)
-
     if os.getenv("CS50_IDE_TYPE") == "online":
         from werkzeug.middleware.proxy_fix import ProxyFix
         _flask_init_before = f.Flask.__init__

Diff for: src/cs50/sql.py

@@ -1,28 +1,4 @@
-def _enable_logging(f):
-    """Enable logging of SQL statements when Flask is in use."""
-
-    import logging
-    import functools
-
-    @functools.wraps(f)
-    def decorator(*args, **kwargs):
-
-        # Infer whether Flask is installed
-        try:
-            import flask
-        except ModuleNotFoundError:
-            return f(*args, **kwargs)
-
-        # Enable logging
-        disabled = logging.getLogger("cs50").disabled
-        if flask.current_app:
-            logging.getLogger("cs50").disabled = False
-        try:
-            return f(*args, **kwargs)
-        finally:
-            logging.getLogger("cs50").disabled = disabled
-
-    return decorator
+import logging
 
 
 class SQL(object):
@@ -45,9 +21,6 @@ def __init__(self, url, **kwargs):
         import sqlalchemy
         import sqlite3
 
-        # Get logger
-        self._logger = logging.getLogger("cs50")
-
         # Require that file already exist for SQLite
         matches = re.search(r"^sqlite:///(.+)$", url)
         if matches:
@@ -78,20 +51,17 @@ def connect(dbapi_connection, connection_record):
         # Register listener
         sqlalchemy.event.listen(self._engine, "connect", connect)
 
-        # Log statements to standard error
-        logging.basicConfig(level=logging.DEBUG)
-
         # Test database
+        disabled = logging.root.disabled
+        logging.root.disabled = True
         try:
-            disabled = self._logger.disabled
-            self._logger.disabled = True
             self.execute("SELECT 1")
         except sqlalchemy.exc.OperationalError as e:
             e = RuntimeError(_parse_exception(e))
             e.__cause__ = None
             raise e
         finally:
-            self._logger.disabled = disabled
+            logging.root.disabled = disabled
 
     def __del__(self):
         """Disconnect from database."""
@@ -103,7 +73,6 @@ def _disconnect(self):
             self._connection.close()
             delattr(self, "_connection")
 
-    @_enable_logging
     def execute(self, sql, *args, **kwargs):
         """Execute a SQL statement."""
 
@@ -373,22 +342,22 @@ def shutdown_session(exception=None):
 
             # If constraint violated, return None
             except sqlalchemy.exc.IntegrityError as e:
-                self._logger.debug(termcolor.colored(statement, "yellow"))
+                logging.debug(termcolor.colored(statement, "yellow"))
                 e = ValueError(e.orig)
                 e.__cause__ = None
                 raise e
 
             # If user error
             except (sqlalchemy.exc.OperationalError, sqlalchemy.exc.ProgrammingError) as e:
                 self._disconnect()
-                self._logger.debug(termcolor.colored(statement, "red"))
+                logging.debug(termcolor.colored(statement, "red"))
                 e = RuntimeError(e.orig)
                 e.__cause__ = None
                 raise e
 
             # Return value
             else:
-                self._logger.debug(termcolor.colored(_statement, "green"))
+                logging.debug(termcolor.colored(_statement, "green"))
                 return ret
 
     def _escape(self, value):