Commit 53b35627 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Restore logfile parameter, deleted in commit #632, and removed unused variable.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@653 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent b4feb441
...@@ -36,9 +36,9 @@ section = options.section or 'admin' ...@@ -36,9 +36,9 @@ section = options.section or 'admin'
logfile = options.logfile or None logfile = options.logfile or None
if options.verbose: if options.verbose:
logging.basicConfig(level=logging.DEBUG, format=DEFAULT_LOG_FORMAT) logging.basicConfig(filename=logfile, level=logging.DEBUG, format=DEFAULT_LOG_FORMAT)
else: else:
logging.basicConfig(level=logging.INFO, format=DEFAULT_LOG_FORMAT) logging.basicConfig(filename=logfile, level=logging.INFO, format=DEFAULT_LOG_FORMAT)
app = Application(config, section) app = Application(config, section)
app.run() app.run()
...@@ -36,11 +36,10 @@ port = options.port or 5555 ...@@ -36,11 +36,10 @@ port = options.port or 5555
ip = options.ip or '127.0.0.1' ip = options.ip or '127.0.0.1'
handler = options.handler or "SocketConnector" handler = options.handler or "SocketConnector"
format='[%(module)12s:%(lineno)3d] %(message)s'
if options.verbose: if options.verbose:
logging.basicConfig(level=logging.DEBUG, format=DEFAULT_LOG_FORMAT) logging.basicConfig(filename=logfile, level=logging.DEBUG, format=DEFAULT_LOG_FORMAT)
else: else:
logging.basicConfig(level=logging.INFO, format=DEFAULT_LOG_FORMAT) logging.basicConfig(filename=logfile, level=logging.INFO, format=DEFAULT_LOG_FORMAT)
app = Application(ip, port, handler) app = Application(ip, port, handler)
......
...@@ -37,7 +37,6 @@ config = options.config or 'neo.conf' ...@@ -37,7 +37,6 @@ config = options.config or 'neo.conf'
section = options.section or 'master' section = options.section or 'master'
logfile = options.logfile or None logfile = options.logfile or None
format='[%(module)12s:%(lineno)3d] %(message)s'
if options.verbose: if options.verbose:
logging.basicConfig(filename=logfile, level=logging.DEBUG, format=DEFAULT_LOG_FORMAT) logging.basicConfig(filename=logfile, level=logging.DEBUG, format=DEFAULT_LOG_FORMAT)
else: else:
......
...@@ -39,7 +39,6 @@ config = options.config or 'neo.conf' ...@@ -39,7 +39,6 @@ config = options.config or 'neo.conf'
section = options.section or 'storage' section = options.section or 'storage'
logfile = options.logfile or None logfile = options.logfile or None
format='[%(module)12s:%(lineno)3d] %(message)s'
if options.verbose: if options.verbose:
logging.basicConfig(filename=logfile, level=logging.DEBUG, format=DEFAULT_LOG_FORMAT) logging.basicConfig(filename=logfile, level=logging.DEBUG, format=DEFAULT_LOG_FORMAT)
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment