got rid of an extra config file in favor of a dict config. made conso…

…le logging the default. fixed flake8 suggestions

server/linux_x11/config.py.example

@@ -34,6 +34,10 @@ ENABLE_XSEL = False
 # input issues.  Obviously this setting does not apply when ENABLE_XSEL = True.
 XDOTOOL_DELAY = 0
 
-# Server log file.  To enable file based logging please copy
-# logging.config.example to logging.config and edit as noted.
+# Server log file path
 #LOG_FILE = '/path/to/server.log'
+
+# Logger verbosity settings.  See the following for a list of levels:
+# https://docs.python.org/2/library/logging.html#levels
+#CONSOLE_LOG_LEVEL = 'DEBUG'
+#FILE_LOG_LEVEL = 'DEBUG'

server/linux_x11/server_logging.py

@@ -0,0 +1,48 @@
+DEFAULT_CONFIG = {
+    'version': 1,
+    'formatters': {
+        'generic': {
+            'format': '%(asctime)s [%(levelname)-6s] [%(name)-s] %(message)s'
+        }
+    },
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+            'level': 'DEBUG',
+            'formatter': 'generic'
+        }
+    },
+    'loggers': {
+        'root': {
+            'level': 'DEBUG',
+            'handlers': [],
+            'propagate': True
+        },
+        'server': {
+            'level': 'DEBUG',
+            'handlers': ['console']
+        }
+    }
+}
+
+
+def make_logging_config(aenea_config):
+    log_file = getattr(aenea_config, 'LOG_FILE', None)
+    console_level = getattr(aenea_config, 'CONSOLE_LOG_LEVEL', 'DEBUG')
+    file_level = getattr(aenea_config, 'FILE_LOG_LEVEL', 'DEBUG')
+
+    logging_config = DEFAULT_CONFIG.copy()
+    logging_config['handlers']['console']['level'] = console_level
+
+    if log_file is not None:
+        logging_config['handlers']['file'] = {
+            'class': 'logging.handlers.RotatingFileHandler',
+            'formatter': 'generic',
+            'level': file_level,
+            'filename': log_file,
+            'mode': 'a',
+            'backupCount': 3
+        }
+        logging_config['loggers']['server']['handlers'].append('file')
+
+    return logging_config

server/linux_x11/server_x11.py

@@ -29,17 +29,13 @@
     setattr(config, 'XDOTOOL_DELAY', 0)
 
 import logging.config
+import server_logging
+
 try:
-    log_file = '/dev/null' if not hasattr(config, 'LOG_FILE') else config.LOG_FILE
-    logging.config.fileConfig(
-        os.path.join(os.path.dirname(__file__), 'logging.config'),
-        defaults={'log_file': log_file},
-        disable_existing_loggers=False
-    )
+    logging_config = server_logging.make_logging_config(config)
+    logging.config.dictConfig(logging_config)
 except Exception, e:
-    print 'Failed to load logging configuration.  Please copy ' \
-          'logging.config.example to logging.config for server' \
-          ' logging support.'
+    print 'Failed to initialize logging support. Error: %s' % e
 
 import logging
 logger = logging.getLogger('server')
@@ -365,6 +361,7 @@ def write_text(text, paste=False, _xdotool=None):
                 arguments='type --file - --delay %d' % config.XDOTOOL_DELAY
             )
 
+
 def click_mouse(
         button,
         direction='click',
@@ -390,7 +387,7 @@ def click_mouse(
         button = int(button)
 
     command = ('%s %s %s %s' %
-              (_MOUSE_CLICKS[direction], delay, repeat, button))
+               (_MOUSE_CLICKS[direction], delay, repeat, button))
 
     if _xdotool is not None:
         _xdotool.append(command)
@@ -503,11 +500,10 @@ def setup_server(host, port):
         ctx = get_context()
         try:
             import pprint
-            pprint.pprint(ctx)
+            logger.info(pprint.pformat(ctx))
         except ImportError, e:
             logger.error('failed to pretty print context. error:%s' % e)
 
-
     else:
         if '-d' in sys.argv or '--daemon' in sys.argv:
             if os.fork() == 0: