From 0dbd9b603aa389b6c40ab1a072fc96808c249d89 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 10 Oct 2012 22:48:29 +0200
Subject: [PATCH] [IMP] remove standalone web client, fix logging

bzr revid: al@openerp.com-20121010204829-5vamumz9lhxpsgob
---
 openerp/netsvc.py       | 3 +--
 openerp/tools/config.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index c1a31602262..e2e435a746f 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -192,8 +192,7 @@ def init_logger():
     default_config = [
         'openerp.netsvc.rpc.request:INFO',
         'openerp.netsvc.rpc.response:INFO',
-        'openerp.addons.web.common.http:INFO',
-        'openerp.addons.web.common.openerplib:INFO',
+        'openerp.addons.web.http:INFO',
         'openerp.sql_db:INFO',
         ':INFO',
     ]
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 18b442221c9..56f1e5c7b83 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -182,7 +182,7 @@ class configmanager(object):
         group.add_option('--log-handler', action="append", default=[':INFO'], my_default=[':INFO'], metavar="PREFIX:LEVEL", help='setup a handler at LEVEL for a given PREFIX. An empty PREFIX indicates the root logger. This option can be repeated. Example: "openerp.orm:DEBUG" or "werkzeug:CRITICAL" (default: ":INFO")')
         group.add_option('--log-request', action="append_const", dest="log_handler", const="openerp.netsvc.rpc.request:DEBUG", help='shortcut for --log-handler=openerp.netsvc.rpc.request:DEBUG')
         group.add_option('--log-response', action="append_const", dest="log_handler", const="openerp.netsvc.rpc.response:DEBUG", help='shortcut for --log-handler=openerp.netsvc.rpc.response:DEBUG')
-        group.add_option('--log-web', action="append_const", dest="log_handler", const="openerp.addons.web.common.http:DEBUG", help='shortcut for --log-handler=openerp.addons.web.common.http:DEBUG')
+        group.add_option('--log-web', action="append_const", dest="log_handler", const="openerp.addons.web.http:DEBUG", help='shortcut for --log-handler=openerp.addons.web.http:DEBUG')
         group.add_option('--log-sql', action="append_const", dest="log_handler", const="openerp.sql_db:DEBUG", help='shortcut for --log-handler=openerp.sql_db:DEBUG')
         # For backward-compatibility, map the old log levels to something
         # quite close.