Put set_logging in utils.py

Remove duplicate code and fix accordingly binaries.

bin/swfiller

@@ -15,23 +15,6 @@ from swsync import filler
 from swsync import utils
 
 
-def set_logging(level):
-    logger = logging.getLogger()
-    logger.setLevel({
-        'debug': logging.DEBUG,
-        'info': logging.INFO,
-        'warning': logging.WARNING,
-        'error': logging.ERROR,
-        'critical': logging.CRITICAL}.get(
-            level.lower()
-        ))
-    loghandler = logging.StreamHandler()
-    logger.addHandler(loghandler)
-    logger = logging.LoggerAdapter(logger, 'swfiller')
-    logformat = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
-    loghandler.setFormatter(logformat)
-
-
 def main():
     parser = argparse.ArgumentParser(prog='swift-filler', add_help=True)
     parser.add_argument('--delete',
@@ -61,7 +44,7 @@ def main():
                         help='Specify the log level')
     args = parser.parse_args()
 
-    set_logging(args.log_level)
+    utils.set_logging(args.log_level)
 
     if not args.create and not args.delete:
         parser.print_help()

bin/swsync

@@ -16,32 +16,16 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import sys
-import logging
 import optparse
 
 import swsync.accounts
-from swsync.utils import parse_ini, ConfigurationError
+from swsync.utils import parse_ini, ConfigurationError, set_logging
+
 
 class Main(object):
     def __init__(self):
         self.options = {}
 
-    def set_logging(self):
-        logger = logging.getLogger()
-        logger.setLevel({
-            'debug': logging.DEBUG,
-            'info': logging.INFO,
-            'warning': logging.WARNING,
-            'error': logging.ERROR,
-            'critical': logging.CRITICAL}.get(
-                self.options.log_level.lower()
-            ))
-        loghandler = logging.StreamHandler()
-        logger.addHandler(loghandler)
-        logger = logging.LoggerAdapter(logger, 'swsync')
-        logformat = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
-        loghandler.setFormatter(logformat)
-
     def main(self):
         usage = "usage: %prog [OPTIONS] [CONF_FILE]"
         parser = optparse.OptionParser(usage=usage)
@@ -60,7 +44,7 @@ class Main(object):
                 parser.print_help()
                 sys.exit(1)
 
-        self.set_logging()
+        set_logging(self.options.log_level.lower())
         #beurk
         swsync.utils.CONFIG = conf
         swsync.accounts.main()

swsync/utils.py

@@ -16,6 +16,7 @@
 # under the License.
 import os
 import ConfigParser
+import logging
 
 
 CONFIG = None
@@ -27,6 +28,23 @@ class ConfigurationError(Exception):
     pass
 
 
+def set_logging(level):
+    logger = logging.getLogger()
+    logger.setLevel({
+        'debug': logging.DEBUG,
+        'info': logging.INFO,
+        'warning': logging.WARNING,
+        'error': logging.ERROR,
+        'critical': logging.CRITICAL}.get(
+            level.lower()
+        ))
+    loghandler = logging.StreamHandler()
+    logger.addHandler(loghandler)
+    logger = logging.LoggerAdapter(logger, 'swfiller')
+    logformat = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+    loghandler.setFormatter(logformat)
+
+
 def parse_ini(inicfg=None):
     if hasattr(inicfg, 'read'):
         fp = inicfg