Add option to customize log format

supervisor/options.py

@@ -400,6 +400,7 @@ class ServerOptions(Options):
     sockchmod = None
     logfile = None
     loglevel = None
+    logformat = None
     pidfile = None
     passwdfile = None
     nodaemon = None
@@ -431,6 +432,8 @@ def __init__(self):
                  "z:", "logfile_backups=", integer, default=10)
         self.add("loglevel", "supervisord.loglevel", "e:", "loglevel=",
                  logging_level, default="info")
+        self.add("logformat", "supervisord.logformat", "", "logformat=",
+                 str, default='%(asctime)s %(levelname)s %(message)s')
         self.add("pidfile", "supervisord.pidfile", "j:", "pidfile=",
                  existing_dirpath, default="supervisord.pid")
         self.add("identifier", "supervisord.identifier", "i:", "identifier=",
@@ -493,6 +496,9 @@ def realize(self, *arg, **kw):
         if not self.loglevel:
             self.loglevel = section.loglevel
 
+        if not self.logformat:
+            self.logformat = section.logformat
+
         if self.logfile:
             logfile = self.logfile
         else:
@@ -635,6 +641,7 @@ def get(opt, default, **kwargs):
         section.logfile_maxbytes = byte_size(get('logfile_maxbytes', '50MB'))
         section.logfile_backups = integer(get('logfile_backups', 10))
         section.loglevel = logging_level(get('loglevel', 'info'))
+        section.logformat = str(get('logformat', '%(asctime)s %(levelname)s %(message)s', do_expand=False))
         section.pidfile = existing_dirpath(get('pidfile', 'supervisord.pid'))
         section.identifier = get('identifier', 'supervisor')
         section.nodaemon = boolean(get('nodaemon', 'false'))
@@ -1447,7 +1454,7 @@ def set_rlimits_or_exit(self):
 
     def make_logger(self):
         # must be called after realize() and after supervisor does setuid()
-        format = '%(asctime)s %(levelname)s %(message)s\n'
+        format = self.logformat+'\n'
         self.logger = loggers.getLogger(self.loglevel)
         if self.nodaemon:
             loggers.handle_stdout(self.logger, format)

supervisor/tests/test_options.py

@@ -444,6 +444,7 @@ def test_options(self):
         logfile_maxbytes=1000MB
         logfile_backups=5
         loglevel=error
+        logformat=%%(asctime)s | %%(levelname)s | %%(message)s
         pidfile=supervisord.pid
         nodaemon=true
         identifier=fleeb
@@ -513,6 +514,7 @@ def test_options(self):
         self.assertEqual(options.logfile_maxbytes, 1000 * 1024 * 1024)
         self.assertEqual(options.logfile_backups, 5)
         self.assertEqual(options.loglevel, 40)
+        self.assertEqual(options.logformat, '%(asctime)s | %(levelname)s | %(message)s')
         self.assertEqual(options.pidfile, 'supervisord.pid')
         self.assertEqual(options.nodaemon, True)
         self.assertEqual(options.identifier, 'fleeb')
@@ -662,6 +664,7 @@ def test_options(self):
         self.assertEqual(instance.logfile_maxbytes, 1000 * 1024 * 1024)
         self.assertEqual(instance.logfile_backups, 5)
         self.assertEqual(instance.loglevel, 40)
+        self.assertEqual(instance.logformat, '%(asctime)s | %(levelname)s | %(message)s')
         self.assertEqual(instance.pidfile, os.path.join(here,'supervisord.pid'))
         self.assertEqual(instance.nodaemon, True)
         self.assertEqual(instance.passwdfile, None)