summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Logger.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-03-19 09:36:23 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-03-19 09:36:56 -0500
commitb4533e6cd9159f4d7e526978914c35e883ca3113 (patch)
tree9be7b1c93adda3ec0d4358dbf8f706d544d72996 /src/lib/Bcfg2/Logger.py
parentdd2d697c6f7d41cb2fb160a63a3f28b2c7c93805 (diff)
downloadbcfg2-b4533e6cd9159f4d7e526978914c35e883ca3113.tar.gz
bcfg2-b4533e6cd9159f4d7e526978914c35e883ca3113.tar.bz2
bcfg2-b4533e6cd9159f4d7e526978914c35e883ca3113.zip
Logger: Fix encoding traceback (#1140)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Logger.py')
-rw-r--r--src/lib/Bcfg2/Logger.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Logger.py b/src/lib/Bcfg2/Logger.py
index c2eac1e60..89fa9fb79 100644
--- a/src/lib/Bcfg2/Logger.py
+++ b/src/lib/Bcfg2/Logger.py
@@ -105,7 +105,11 @@ class FragmentingSysLogHandler(logging.handlers.SysLogHandler):
(self.encodePriority(self.facility, newrec.levelname.lower()),
self.format(newrec))
try:
- self.socket.send(msg.encode('ascii'))
+ try:
+ encoded = msg.encode('utf-8')
+ except UnicodeDecodeError:
+ encoded = msg
+ self.socket.send(encoded)
except socket.error:
for i in range(10): # pylint: disable=W0612
try: