summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-08-14 22:17:53 +0000
committerTarmac <>2010-08-14 22:17:53 +0000
commit0a7121efbef13ce832b2930baf61c07b66dc5e9a (patch)
tree323455c6f7ca19822146444a8b106c6a12a62fe0
parentcecfc6a60dbdefaab8bcc549f09e7e88aa3b29d5 (diff)
parent4d7fe5555de3c7e475a436af11559b00d7af5790 (diff)
Removes the workaround for syslog-ng of removing newlines.
-rw-r--r--nova/twistd.py10
1 files changed, 1 insertions, 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)