Skip to content

Commit

Permalink
Feat CCT-965: Include timezone in the logs
Browse files Browse the repository at this point in the history
In `subscription-manager/src/rhsm/logutil.py`i:

* New loggin formater class `RhsmISO8601Formatter` was made
to ensure that time stamp entry is in ISO-8810 format and
that it contains info about milliseconds and time zone.

* Then variable `LOG_FORMATTER` is made and `RhsmISO8601Formatter(LOG_FORMAT)`
is assigned to it. Then distributed to places where `.setFormatter(Formatter(LOG_FORMAT, ...))` occured.

CARD CCT-965
  • Loading branch information
mgrunwal committed Nov 28, 2024
1 parent 56ff65e commit b97d2cb
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/rhsm/logutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,13 @@

from typing import Optional, Tuple, Union, List

import datetime
import logging
import logging.handlers
import logging.config
import os
import sys
import rhsm.config
import datetime


class RhsmISO8601Formatter(logging.Formatter):
"""Ensure date & time to be in ISO8601 format and containing info about milliseconds and time zone"""

def formatTime(self, record, datefmt=None):
return datetime.datetime.fromtimestamp(record.created).astimezone().isoformat(timespec="milliseconds")


LOGFILE_DIR = "/var/log/rhsm/"
Expand All @@ -39,8 +32,6 @@ def formatTime(self, record, datefmt=None):
"%(threadName)s @%(filename)s:%(lineno)d - %(message)s"
)

LOG_FORMATTER = RhsmISO8601Formatter(LOG_FORMAT)

_rhsm_log_handler: Optional["RHSMLogHandler"] = None
_subman_debug_handler: Optional["SubmanDebugHandler"] = None
log: Optional[logging.Logger] = None
Expand Down Expand Up @@ -155,6 +146,15 @@ def __init__(self, name) -> None:
self.setLevel(self.level)
self.addFilter(PyWarningsLoggingFilter(name="py.warnings"))

class RhsmISO8601Formatter(logging.Formatter):
"""Ensure date & time to be in ISO8601 format and containing info about milliseconds and time zone"""

def __init__(self):
super().__init__(fmt=LOG_FORMAT)

def formatTime(self, record, datefmt=None):
return datetime.datetime.fromtimestamp(record.created).astimezone().isoformat(timespec="milliseconds")


def _get_default_rhsm_log_handler() -> (
Tuple[Union[logging.handlers.RotatingFileHandler, logging.StreamHandler], Optional[str]]
Expand All @@ -163,15 +163,15 @@ def _get_default_rhsm_log_handler() -> (
error: Optional[Exception] = None
if not _rhsm_log_handler:
_rhsm_log_handler, error = RHSMLogHandler(LOGFILE_PATH, USER_LOGFILE_PATH)
_rhsm_log_handler.setFormatter(LOG_FORMATTER)
_rhsm_log_handler.setFormatter(RhsmISO8601Formatter())
return _rhsm_log_handler, error


def _get_default_subman_debug_handler() -> Union[None, "SubmanDebugHandler"]:
global _subman_debug_handler
if not _subman_debug_handler:
_subman_debug_handler = SubmanDebugHandler()
_subman_debug_handler.setFormatter(LOG_FORMATTER)
_subman_debug_handler.setFormatter(RhsmISO8601Formatter())
return _subman_debug_handler


Expand Down

0 comments on commit b97d2cb

Please sign in to comment.