Gamercat
/
geneva
mirror of https://github.com/Kkevsterrr/geneva
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix merge conflicts

This commit is contained in:
Yair Fax 2020-07-06 20:33:34 +00:00
parent 089e2541fc
commit 703dad8c2b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/utils.py
View File

@ -135,7 +135,7 @@ def get_logger(basepath, log_dir, logger_name, log_name, environment_id, log_lev
log_prefix = "[%s] " % log_name.upper()
formatter = logging.Formatter("%(asctime)s %(levelname)s:" + log_prefix + "%(message)s", datefmt="%Y-%m-%d %H:%M:%S")
file_formatter = logging.Formatter(log_prefix + "%(asctime)s %(message)s")
fh.setFormatter(fileatter)
fh.setFormatter(file_formatter)
logger.addHandler(fh)
ch = logging.StreamHandler()
@ -229,7 +229,6 @@ class CustomAdapter(logging.LoggerAdapter):
msg = msg.replace(ip, self.ips[ip])
return msg, kwargs
return msg, tuple(new_args), kwargs
def close_logger(logger):