ir_logging, cleanup and minimize merge diff
bzr revid: al@openerp.com-20140316192223-gfxzbo83j5hpm527
This commit is contained in:
parent
eaacd8a4d8
commit
58fb28746a
|
@ -19,11 +19,9 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import contextlib
|
|
||||||
import logging
|
import logging
|
||||||
import logging.handlers
|
import logging.handlers
|
||||||
import os
|
import os
|
||||||
import platform
|
|
||||||
import release
|
import release
|
||||||
import sys
|
import sys
|
||||||
import threading
|
import threading
|
||||||
|
@ -35,7 +33,6 @@ import tools
|
||||||
import openerp
|
import openerp
|
||||||
import sql_db
|
import sql_db
|
||||||
|
|
||||||
|
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
def log(logger, level, prefix, msg, depth=None):
|
def log(logger, level, prefix, msg, depth=None):
|
||||||
|
@ -141,7 +138,8 @@ def init_logger():
|
||||||
handler = logging.handlers.NTEventLogHandler("%s %s" % (release.description, release.version))
|
handler = logging.handlers.NTEventLogHandler("%s %s" % (release.description, release.version))
|
||||||
else:
|
else:
|
||||||
handler = logging.handlers.SysLogHandler()
|
handler = logging.handlers.SysLogHandler()
|
||||||
format = '%s %s' % (release.description, release.version) + ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
|
format = '%s %s' % (release.description, release.version) \
|
||||||
|
+ ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
|
||||||
|
|
||||||
elif tools.config['logfile']:
|
elif tools.config['logfile']:
|
||||||
# LogFile Handler
|
# LogFile Handler
|
||||||
|
@ -151,14 +149,12 @@ def init_logger():
|
||||||
dirname = os.path.dirname(logf)
|
dirname = os.path.dirname(logf)
|
||||||
if dirname and not os.path.isdir(dirname):
|
if dirname and not os.path.isdir(dirname):
|
||||||
os.makedirs(dirname)
|
os.makedirs(dirname)
|
||||||
|
|
||||||
if tools.config['logrotate'] is not False:
|
if tools.config['logrotate'] is not False:
|
||||||
handler = logging.handlers.TimedRotatingFileHandler(filename=logf, when='D', interval=1, backupCount=30)
|
handler = logging.handlers.TimedRotatingFileHandler(filename=logf, when='D', interval=1, backupCount=30)
|
||||||
elif os.name == 'posix':
|
elif os.name == 'posix':
|
||||||
handler = logging.handlers.WatchedFileHandler(logf)
|
handler = logging.handlers.WatchedFileHandler(logf)
|
||||||
else:
|
else:
|
||||||
handler = logging.handlers.FileHandler(logf)
|
handler = logging.handlers.FileHandler(logf)
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
sys.stderr.write("ERROR: couldn't create the logfile directory. Logging to the standard output.\n")
|
sys.stderr.write("ERROR: couldn't create the logfile directory. Logging to the standard output.\n")
|
||||||
handler = logging.StreamHandler(sys.stdout)
|
handler = logging.StreamHandler(sys.stdout)
|
||||||
|
@ -177,7 +173,6 @@ def init_logger():
|
||||||
formatter = ColoredFormatter(format)
|
formatter = ColoredFormatter(format)
|
||||||
else:
|
else:
|
||||||
formatter = DBFormatter(format)
|
formatter = DBFormatter(format)
|
||||||
|
|
||||||
handler.setFormatter(formatter)
|
handler.setFormatter(formatter)
|
||||||
|
|
||||||
# Configure handlers
|
# Configure handlers
|
||||||
|
@ -203,8 +198,6 @@ def init_logger():
|
||||||
for logconfig_item in logging_configurations:
|
for logconfig_item in logging_configurations:
|
||||||
_logger.debug('logger level set: "%s"', logconfig_item)
|
_logger.debug('logger level set: "%s"', logconfig_item)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_LOG_CONFIGURATION = [
|
DEFAULT_LOG_CONFIGURATION = [
|
||||||
'openerp.workflow.workitem:WARNING',
|
'openerp.workflow.workitem:WARNING',
|
||||||
'openerp.netsvc.rpc.request:INFO',
|
'openerp.netsvc.rpc.request:INFO',
|
||||||
|
|
Loading…
Reference in New Issue