From 1349178157931211a6597092e58812cabcfee96a Mon Sep 17 00:00:00 2001
From: David Snopek <dsnopek@gmail.com>
Date: Tue, 16 Jul 2013 19:50:45 +0100
Subject: [PATCH] Moved logging into a utils module so we don't have to
 duplicate it.

---
 AnkiServer/apps/rest_app.py | 10 ++--------
 AnkiServer/utils.py         | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 AnkiServer/utils.py

diff --git a/AnkiServer/apps/rest_app.py b/AnkiServer/apps/rest_app.py
index a688c1a..752b399 100644
--- a/AnkiServer/apps/rest_app.py
+++ b/AnkiServer/apps/rest_app.py
@@ -463,16 +463,10 @@ class CardHandler(RestHandlerBase):
 # Our entry point
 def make_app(global_conf, **local_conf):
     # setup the logger
+    from AnkiServer.utils import setup_logging
     logging_config_file = local_conf.get('logging.config_file')
     if logging_config_file:
-        # monkey patch the logging.config.SMTPHandler if necessary
-        import sys
-        if sys.version_info[0] == 2 and sys.version_info[1] == 5:
-            import AnkiServer.logpatch
-
-        # load the config file
-        import logging.config
-        logging.config.fileConfig(logging_config_file)
+        setup_logging(logging_config_file)
 
     return RestApp(
         data_root=local_conf.get('data_root', '.'),
diff --git a/AnkiServer/utils.py b/AnkiServer/utils.py
new file mode 100644
index 0000000..bd83664
--- /dev/null
+++ b/AnkiServer/utils.py
@@ -0,0 +1,15 @@
+
+def setup_logging(config_file):
+    """Setup logging based on a config_file."""
+
+    import logging
+
+    # monkey patch the logging.config.SMTPHandler if necessary
+    import sys
+    if sys.version_info[0] == 2 and sys.version_info[1] == 5:
+        import AnkiServer.logpatch
+
+    # load the config file
+    import logging.config
+    logging.config.fileConfig(config_file)
+