M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

master: timestamp logfiles

This commit is contained in:
Sebastien Bourdeauducq 2015-10-17 10:26:54 +08:00
parent 60ed88f3d9
commit 04a049b93d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/master/log.py
View File

@ -58,12 +58,10 @@ def init_log(args):
root_logger.setLevel(logging.NOTSET) # we use our custom filter only root_logger.setLevel(logging.NOTSET) # we use our custom filter only
flt = SourceFilter(logging.WARNING + args.quiet*10 - args.verbose*10, flt = SourceFilter(logging.WARNING + args.quiet*10 - args.verbose*10,
"master") "master")
full_fmt = logging.Formatter(
"%(levelname)s:%(source)s:%(name)s:%(message)s")
handlers = [] handlers = []
console_handler = logging.StreamHandler() console_handler = logging.StreamHandler()
console_handler.setFormatter(full_fmt) console_handler.setFormatter(logging.Formatter(
"%(levelname)s:%(source)s:%(name)s:%(message)s"))
handlers.append(console_handler) handlers.append(console_handler)
if args.log_file: if args.log_file:
@ -71,7 +69,8 @@ def init_log(args):
args.log_file, args.log_file,
maxBytes=args.log_max_size*1024, maxBytes=args.log_max_size*1024,
backupCount=args.log_backup_count) backupCount=args.log_backup_count)
file_handler.setFormatter(full_fmt) file_handler.setFormatter(logging.Formatter(
"%(asctime)s %(levelname)s:%(source)s:%(name)s:%(message)s"))
handlers.append(file_handler) handlers.append(file_handler)
log_buffer = LogBuffer(1000) log_buffer = LogBuffer(1000)