#!/usr/bin/env python
+import json
+import logging
+import logging.config
import optparse
import os
import sys
-import json
import tempfile
-import logging
-import logging.config
import werkzeug.serving
import werkzeug.contrib.fixers
optparser = optparse.OptionParser()
optparser.add_option("-s", "--session-path", dest="session_storage",
default=os.path.join(tempfile.gettempdir(), "oe-sessions"),
- help="directory used for session storage", metavar="DIR")
+ help="Directory used for session storage", metavar="DIR")
optparser.add_option("--server-host", dest="server_host",
default='127.0.0.1', help="OpenERP server hostname", metavar="HOST")
optparser.add_option("--server-port", dest="server_port", default=8069,
help="OpenERP server port", type="int", metavar="NUMBER")
optparser.add_option("--db-filter", dest="dbfilter", default='.*',
- help="Filter listed database", metavar="REGEXP")
+ help="Filter listed databases", metavar="REGEXP")
optparser.add_option('--addons-path', dest='addons_path', default=[], action='append',
- help="Path do addons directory", metavar="PATH")
+ help="Path to addons directory", metavar="PATH")
optparser.add_option('--load', dest='server_wide_modules', default=['web'], action='append',
- help="Load a additional module before login (by default only 'web' is loaded)", metavar="MODULE")
+ help="Load an additional module before login (by default only 'web' is loaded)", metavar="MODULE")
server_options = optparse.OptionGroup(optparser, "Server configuration")
server_options.add_option("-p", "--port", dest="socket_port", default=8002,
if os.path.exists(path_addons):
options.addons_path.append(path_addons)
- def remove_end_slash(text):
- if text[-1] in '/\\':
- return text[:-1]
- return text
-
- def drop_false_path(path):
- if os.path.exists(path):
- return True
-
- options.addons_path = map(remove_end_slash, options.addons_path)
- options.addons_path = filter(drop_false_path, options.addons_path)
+ options.addons_path = [
+ path[:-1] if path[-1] in r'\/' else path
+ for path in options.addons_path
+ if os.path.exists(path)
+ ]
for path_addons in options.addons_path:
if path_addons not in sys.path:
with open(options.log_config) as file:
dct = json.load(file)
logging.config.dictConfig(dct)
- logging.getLogger("").setLevel(getattr(logging, options.log_level.upper()))
+ logging.getLogger().setLevel(getattr(logging, options.log_level.upper()))
else:
logging.basicConfig(level=getattr(logging, options.log_level.upper()))
- app = web.common.http.Root(options)
+ app = web.common.http.Root(options, openerp_addons_namespace=False)
if options.proxy_mode:
app = werkzeug.contrib.fixers.ProxyFix(app)