Просмотр исходного кода

Moved SyslogHandler registration to a similarly-named function in loggers.

--HG--
extra : source : 8877155f89b3622e3db291b228b379a6c4e12643
Jason R. Coombs 12 лет назад
Родитель
Сommit
62fc29f106
2 измененных файлов с 8 добавлено и 4 удалено
  1. 2 4
      supervisor/dispatchers.py
  2. 6 0
      supervisor/loggers.py

+ 2 - 4
supervisor/dispatchers.py

@@ -142,10 +142,8 @@ class POutputDispatcher(PDispatcher):
             backups=backups)
 
         if getattr(config, '%s_syslog' % channel, False):
-            handler = loggers.SysLogHandler()
-            handler.setFormat(config.name + ' %(message)s')
-            handler.setLevel(self.mainlog.level)
-            loggers.addHandler(handler)
+            fmt = config.name + ' %(message)s'
+            loggers.handle_syslog(self.mainlog, fmt)
 
     def removelogs(self):
         for log in (self.mainlog, self.capturelog):

+ 6 - 0
supervisor/loggers.py

@@ -341,6 +341,12 @@ def handle_stdout(logger, fmt):
     handler.setLevel(logger.level)
     logger.addHandler(handler)
 
+def handle_syslog(logger, fmt):
+    handler = SyslogHandler()
+    handler.setFormat(fmt)
+    handler.setLevel(logger.level)
+    logger.addHandler(handler)
+
 def handle_file(logger, filename, fmt, rotating=False, maxbytes=0, backups=0):
     if filename == 'syslog':
         handler = SyslogHandler()