XF/pluto
XF
/
pluto
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up colored logging

This commit is contained in:
Mark Veidemanis 2022-03-06 12:10:02 +00:00
parent 34a182cbf5
commit 28d4db5694
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
handler/util.py
View File

@ -6,11 +6,9 @@ import logging
log = logging.getLogger("util") log = logging.getLogger("util")
# Color definitions
BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8) BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
COLORS = {"WARNING": YELLOW, "INFO": WHITE, "DEBUG": BLUE, "CRITICAL": YELLOW, "ERROR": RED}
# The background is set with 40 plus the number of the color, and the foreground with 30
# These are the sequences need to get colored ouput
RESET_SEQ = "\033[0m" RESET_SEQ = "\033[0m"
COLOR_SEQ = "\033[1;%dm" COLOR_SEQ = "\033[1;%dm"
BOLD_SEQ = "\033[1m" BOLD_SEQ = "\033[1m"
@ -24,9 +22,6 @@ def formatter_message(message, use_color=True):
return message return message
COLORS = {"WARNING": YELLOW, "INFO": WHITE, "DEBUG": BLUE, "CRITICAL": YELLOW, "ERROR": RED}
class ColoredFormatter(logging.Formatter): class ColoredFormatter(logging.Formatter):
def __init__(self, msg, use_color=True): def __init__(self, msg, use_color=True):
logging.Formatter.__init__(self, msg) logging.Formatter.__init__(self, msg)
@ -63,22 +58,6 @@ def get_logger(name):
return log return log
class ColoredLogger(logging.Logger):
FORMAT = "[$BOLD%(name)-20s$RESET][%(levelname)-18s] %(message)s ($BOLD%(filename)s$RESET:%(lineno)d)"
COLOR_FORMAT = formatter_message(FORMAT, True)
def __init__(self, name):
logging.Logger.__init__(self, name, logging.DEBUG)
color_formatter = ColoredFormatter(self.COLOR_FORMAT)
console = logging.StreamHandler()
console.setFormatter(color_formatter)
self.addHandler(console)
return
class Base(object): class Base(object):
def __init__(self): def __init__(self):
name = self.__class__.__name__ name = self.__class__.__name__
@ -130,7 +109,6 @@ def last_online_recent(date):
date_parsed = datetime.strptime(date, "%Y-%m-%dT%H:%M:%S.%fZ") date_parsed = datetime.strptime(date, "%Y-%m-%dT%H:%M:%S.%fZ")
now = datetime.now() now = datetime.now()
sec_ago_date = (now - date_parsed).total_seconds() sec_ago_date = (now - date_parsed).total_seconds()
# self.log.debug("Seconds ago date for {date} ^ {now}: {x}", date=date, now=str(now), x=sec_ago_date)
return sec_ago_date < 172800 return sec_ago_date < 172800