From d4d6e89b8eadd6a8c71244215b3cf5d6bdf88a9a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Fri, 14 Aug 2009 16:09:48 +0200
Subject: [PATCH] [FIX] logger: convert the message in unicode before
 concatenate it with server environment

lp bug: https://launchpad.net/bugs/413594 fixed

bzr revid: christophe@tinyerp.com-20090814140948-c67bfvv3w1lqi41k
---
 bin/netsvc.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index 00ad23152e8..ea6513a5325 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -170,10 +170,12 @@ class Logger(object):
         if isinstance(msg, Exception):
             msg = tools.exception_to_unicode(msg)
 
+        msg = tools.ustr(msg).strip()
+        
         if level in (LOG_ERROR,LOG_CRITICAL):
             msg = common().get_server_environment() + msg
 
-        result = tools.ustr(msg).strip().split('\n')
+        result = msg.split('\n')
         if len(result)>1:
             for idx, s in enumerate(result):
                 level_method('[%02d]: %s' % (idx+1, s,))