From 4d7fe5555de3c7e475a436af11559b00d7af5790 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 12 Aug 2010 11:52:32 -0700
Subject: remove syslog-ng workaround

---
 nova/twistd.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/nova/twistd.py b/nova/twistd.py
index c83276daa..8de322aa5 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -241,15 +241,7 @@ def serve(filename):
         print 'usage: %s [options] [start|stop|restart]' % argv[0]
         sys.exit(1)
 
-    class NoNewlineFormatter(logging.Formatter):
-        """Strips newlines from default formatter"""
-        def format(self, record):
-            """Grabs default formatter's output and strips newlines"""
-            data = logging.Formatter.format(self, record)
-            return data.replace("\n", "--")
-
-    # NOTE(vish): syslog-ng doesn't handle newlines from trackbacks very well
-    formatter = NoNewlineFormatter(
+    formatter = logging.Formatter(
         '(%(name)s): %(levelname)s %(message)s')
     handler = logging.StreamHandler(log.StdioOnnaStick())
     handler.setFormatter(formatter)
-- 
cgit