summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Logger.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-03-21 09:36:34 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-03-21 09:36:34 -0500
commit7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce (patch)
tree54d1dfc689ef0e4bc0d0c178c45e3fd55901d77a /src/lib/Bcfg2/Logger.py
parent98ef06e6a0426958f476f2835839aea5de3f7bc6 (diff)
parent5feb76d97c6b26228dcf521659f434c6b576310c (diff)
downloadbcfg2-7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce.tar.gz
bcfg2-7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce.tar.bz2
bcfg2-7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce.zip
Merge branch 'maint'
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: