From 81ee705498fbe7af0b9908fd88ce3e80e692ddff Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Thu, 2 Feb 2012 13:54:42 +0100
Subject: [PATCH] [IMP] logging: use logging.exception() instead of manually
 formatting the traceback.

bzr revid: vmt@openerp.com-20120202125442-h73uaga3vu2s8upv
---
 .../addons/base/ir/workflow/print_instance.py |  4 +---
 openerp/service/web_services.py               | 24 +++++--------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/openerp/addons/base/ir/workflow/print_instance.py b/openerp/addons/base/ir/workflow/print_instance.py
index 3a907eb151a..c14e01b7a19 100644
--- a/openerp/addons/base/ir/workflow/print_instance.py
+++ b/openerp/addons/base/ir/workflow/print_instance.py
@@ -170,9 +170,7 @@ showpage'''
                         graph_instance_get(cr, graph, inst_id, data.get('nested', False))
                     ps_string = graph.create(prog='dot', format='ps')
         except Exception, e:
-            import traceback, sys
-            tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
-            _logger.error('Exception in call: ' + tb_s)
+            _logger.exception('Exception in call:')
             # string is in PS, like the success message would have been
             ps_string = '''%PS-Adobe-3.0
 /inch {72 mul} def
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index ed72a520869..27f1ec30a90 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -359,9 +359,7 @@ class db(netsvc.ExportService):
             except except_osv, inst:
                 netsvc.abort_response(1, inst.name, 'warning', inst.value)
             except Exception:
-                import traceback
-                tb_s = reduce(lambda x, y: x+y, traceback.format_exception( sys.exc_type, sys.exc_value, sys.exc_traceback))
-                _logger.error(tb_s)
+                _logger.exception('Exception in migrate_databases:')
                 raise
         return True
 
@@ -502,9 +500,7 @@ GNU Public Licence.
         except tm.RemoteContractException, e:
             netsvc.abort_response(1, 'Migration Error', 'warning', str(e))
         except Exception, e:
-            import traceback
-            tb_s = reduce(lambda x, y: x+y, traceback.format_exception( sys.exc_type, sys.exc_value, sys.exc_traceback))
-            _logger.error(tb_s)
+            _logger.exception('Exception in get_migration_script:')
             raise
 
     def exp_get_server_environment(self):
@@ -540,7 +536,6 @@ GNU Public Licence.
         return True
 
     def exp_get_stats(self):
-        import threading
         res = "OpenERP server: %d threads\n" % threading.active_count()
         res += netsvc.Server.allStats()
         return res
@@ -672,8 +667,6 @@ class report_spool(netsvc.ExportService):
         self._reports[id] = {'uid': uid, 'result': False, 'state': False, 'exception': None}
 
         cr = pooler.get_db(db).cursor()
-        import traceback
-        import sys
         try:
             obj = netsvc.LocalService('report.'+object)
             (result, format) = obj.create(cr, uid, ids, datas, context)
@@ -685,12 +678,11 @@ class report_spool(netsvc.ExportService):
             self._reports[id]['state'] = True
         except Exception, exception:
 
-            tb = sys.exc_info()
-            tb_s = "".join(traceback.format_exception(*tb))
-            _logger.error('Exception: %s\n%s', str(exception), tb_s)
+            _logger.exception('Exception: %s\n', str(exception))
             if hasattr(exception, 'name') and hasattr(exception, 'value'):
                 self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
             else:
+                tb = sys.exc_info()
                 self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.exception_to_unicode(exception), tb)
             self._reports[id]['state'] = True
         cr.commit()
@@ -713,8 +705,6 @@ class report_spool(netsvc.ExportService):
 
         def go(id, uid, ids, datas, context):
             cr = pooler.get_db(db).cursor()
-            import traceback
-            import sys
             try:
                 obj = netsvc.LocalService('report.'+object)
                 (result, format) = obj.create(cr, uid, ids, datas, context)
@@ -725,13 +715,11 @@ class report_spool(netsvc.ExportService):
                 self._reports[id]['format'] = format
                 self._reports[id]['state'] = True
             except Exception, exception:
-
-                tb = sys.exc_info()
-                tb_s = "".join(traceback.format_exception(*tb))
-                _logger.errro('Exception: %s\n%s', str(exception), tb_s)
+                _logger.exception('Exception: %s\n', str(exception))
                 if hasattr(exception, 'name') and hasattr(exception, 'value'):
                     self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
                 else:
+                    tb = sys.exc_info()
                     self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.exception_to_unicode(exception), tb)
                 self._reports[id]['state'] = True
             cr.commit()