Merge pull request Supervisor#1284 from vsajip/fix-1232

Alternative approach to addressing Supervisor#1282

Author: mnaberez

.gitignore

@@ -7,7 +7,7 @@
 *.swp
 *.pss
 .DS_Store
-.coverage
+.coverage*
 .eggs/
 .pytest_cache/
 .tox/

supervisor/loggers.py

@@ -16,6 +16,7 @@
 from supervisor.compat import syslog
 from supervisor.compat import long
 from supervisor.compat import is_text_stream
+from supervisor.compat import as_string
 
 class LevelsByName:
     CRIT = 50   # messages that probably require immediate user attention
@@ -288,10 +289,9 @@ def asdict(self):
             part1 = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(now))
             asctime = '%s,%03d' % (part1, msecs)
             levelname = LOG_LEVELS_BY_NUM[self.level]
+            msg = as_string(self.msg)
             if self.kw:
-                msg = self.msg % self.kw
-            else:
-                msg = self.msg
+                msg = msg % self.kw
             self.dictrepr = {'message':msg, 'levelname':levelname,
                              'asctime':asctime}
         return self.dictrepr

supervisor/tests/test_loggers.py

@@ -535,9 +535,12 @@ def asdict(self):
     @mock.patch('syslog.syslog', MockSysLog())
     def test_emit_ascii_noerror(self):
         handler = self._makeOne()
-        record = self._makeLogRecord('hello!')
+        record = self._makeLogRecord(b'hello!')
         handler.emit(record)
         syslog.syslog.assert_called_with('hello!')
+        record = self._makeLogRecord('hi!')
+        handler.emit(record)
+        syslog.syslog.assert_called_with('hi!')
 
     @mock.patch('syslog.syslog', MockSysLog())
     def test_close(self):