mirror of https://github.com/MISP/misp-modules
fix: [log] Disable duplicate logging to stderr and stdout, keep stderr only
parent
3bc58709e1
commit
22f8faa51e
|
@ -58,17 +58,13 @@ def handle_signal(sig, frame):
|
||||||
IOLoop.instance().add_callback_from_signal(IOLoop.instance().stop)
|
IOLoop.instance().add_callback_from_signal(IOLoop.instance().stop)
|
||||||
|
|
||||||
|
|
||||||
def init_logger(level=False):
|
def init_logger(debug=False):
|
||||||
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
||||||
handler = logging.StreamHandler(stream=sys.stdout)
|
handler = logging.StreamHandler()
|
||||||
handler.setFormatter(formatter)
|
handler.setFormatter(formatter)
|
||||||
handler.setLevel(logging.INFO)
|
|
||||||
if level:
|
|
||||||
handler.setLevel(logging.DEBUG)
|
|
||||||
log.addHandler(handler)
|
log.addHandler(handler)
|
||||||
log.setLevel(logging.INFO)
|
log.propagate = False
|
||||||
if level:
|
log.setLevel(logging.DEBUG if debug else logging.INFO)
|
||||||
log.setLevel(logging.DEBUG)
|
|
||||||
return log
|
return log
|
||||||
|
|
||||||
|
|
||||||
|
@ -235,7 +231,7 @@ def main():
|
||||||
port = args.p
|
port = args.p
|
||||||
listen = args.l
|
listen = args.l
|
||||||
if args.devel:
|
if args.devel:
|
||||||
log = init_logger(level=True)
|
log = init_logger(debug=True)
|
||||||
log.info('Launch MISP modules server in development mode. Enable debug, load a list of modules is -m is used.')
|
log.info('Launch MISP modules server in development mode. Enable debug, load a list of modules is -m is used.')
|
||||||
if args.m:
|
if args.m:
|
||||||
mhandlers = {}
|
mhandlers = {}
|
||||||
|
@ -251,7 +247,7 @@ def main():
|
||||||
else:
|
else:
|
||||||
mhandlers, loaded_modules = _launch_from_current_dir()
|
mhandlers, loaded_modules = _launch_from_current_dir()
|
||||||
else:
|
else:
|
||||||
log = init_logger(level=args.d)
|
log = init_logger(debug=args.d)
|
||||||
if args.s:
|
if args.s:
|
||||||
log.info('Launch MISP modules server from package.')
|
log.info('Launch MISP modules server from package.')
|
||||||
load_package_helpers()
|
load_package_helpers()
|
||||||
|
|
Loading…
Reference in New Issue