[07.10.20] Log timestamp with @

This commit is contained in:
andrewso 2020-10-07 10:03:53 +01:00
parent 366ea11345
commit 25a01025b8
2 changed files with 4 additions and 4 deletions

View File

@ -163,7 +163,7 @@ def collector(c_type):
# Dynamically Spin up Child process for each type wanting to track # Dynamically Spin up Child process for each type wanting to track
def collectorMain(c_type): def collectorMain(c_type):
log("== Historical Price Collector ==", 'INFO') log("Starting Historical Price Collector", 'INFO')
collector(c_type) collector(c_type)

View File

@ -8,10 +8,10 @@ import datetime
class CustomJsonFormatter(jsonlogger.JsonFormatter): class CustomJsonFormatter(jsonlogger.JsonFormatter):
def add_fields(self, log_record, record, message_dict): def add_fields(self, log_record, record, message_dict):
super(CustomJsonFormatter, self).add_fields(log_record, record, message_dict) super(CustomJsonFormatter, self).add_fields(log_record, record, message_dict)
if not log_record.get('timestamp'): if not log_record.get('@timestamp'):
# this doesn't use record.created, so it is slightly off # this doesn't use record.created, so it is slightly off
now = datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%fZ') now = datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%fZ')
log_record['timestamp'] = now log_record['@timestamp'] = now
if log_record.get('level'): if log_record.get('level'):
log_record['level'] = log_record['level'].upper() log_record['level'] = log_record['level'].upper()
else: else:
@ -23,7 +23,7 @@ def setup_logging(log_level='INFO'):
logger.setLevel(log_level) logger.setLevel(log_level)
logHandler = logging.StreamHandler() logHandler = logging.StreamHandler()
formatter = CustomJsonFormatter('%(timestamp)s %(level)s %(name)s %(message)s') formatter = CustomJsonFormatter('%(@timestamp)s %(level)s %(name)s %(message)s')
logHandler.setFormatter(formatter) logHandler.setFormatter(formatter)
logger.addHandler(logHandler) logger.addHandler(logHandler)