wip

slapos/equeue/__init__.py

@@ -42,6 +42,16 @@ from six.moves import socketserver
 import io
 import threading
 
+import six
+
+if six.PY3:
+  logging_levels = logging._nameToLevel
+  logging_choices = logging_levels.keys()
+else:
+  logging_levels = logging._levelNames
+  logging_choices = [i for i in logging_levels
+                     if isinstance(i, str)]
+
 # Copied from erp5.util:erp5/util/testnode/ProcessManager.py
 def subprocess_capture(p, log, log_prefix, get_output=True):
   def readerthread(input, output, buffer):
@@ -81,9 +91,9 @@ class EqueueServer(socketserver.ThreadingUnixStreamServer):
 
   def __init__(self, *args, **kw):
     self.options = kw.pop('equeue_options')
-    super(EqueueServer, self).__init__(self,
-                                       RequestHandlerClass=None,
-                                       *args, **kw)
+    socketserver.ThreadingUnixStreamServer.__init__(self,
+                                                    RequestHandlerClass=None,
+                                                    *args, **kw)
     # Equeue Specific elements
     self.setLogger(self.options.logfile[0], self.options.loglevel[0])
     self.setDB(self.options.database[0])
@@ -99,7 +109,7 @@ class EqueueServer(socketserver.ThreadingUnixStreamServer):
     self.logger = logging.getLogger("EQueue")
     handler = logging.handlers.WatchedFileHandler(logfile, mode='a')
     # Natively support logrotate
-    level = logging._levelNames.get(loglevel, logging.INFO)
+    level = logging_levels.get(loglevel, logging.INFO)
     self.logger.setLevel(level)
     formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
     handler.setFormatter(formatter)
@@ -193,8 +203,7 @@ def main():
                       "calls are stored")
   parser.add_argument('--loglevel', nargs=1,
                       default='INFO',
-                      choices=[i for i in logging._levelNames
-                               if isinstance(i, str)],
+                      choices=logging_choices,
                       required=False)
   parser.add_argument('-l', '--logfile', nargs=1, required=True,
                       help="Path to the log file.")