Skip to content

Make log messages RFC5424 compliant #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simon-mueller wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make log messages RFC5424 compliant #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions syslog/journal2syslog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import socket
import ssl
from os import environ
from datetime import datetime

from systemd import journal

Expand Down Expand Up @@ -36,6 +37,10 @@
"hassio_supervisor": PATTERN_LOGLEVEL_HA,
}

class RFC5424Formatter(logging.Formatter):
def formatTime(self, record, datefmt=None):
dt = datetime.fromtimestamp(record.created, tz=datetime.timezone.utc)
return dt.isoformat().replace('+00:00', 'Z')

class TlsSysLogHandler(logging.handlers.SysLogHandler):
def __init__(
Expand Down Expand Up @@ -159,10 +164,9 @@ def parse_log_level(message: str, container_name: str) -> int:
syslog_handler = TlsSysLogHandler(
address=(SYSLOG_HOST, SYSLOG_PORT), socktype=socktype, ssl=use_ssl
)
formatter = logging.Formatter(
formatter = RFC5424Formatter(
f"%(asctime)s %(ip)s %(prog)s: %(message)s",
defaults={"ip": HAOS_HOSTNAME},
datefmt="%b %d %H:%M:%S",
defaults={"ip": HAOS_HOSTNAME}
)
syslog_handler.setFormatter(formatter)
logger.addHandler(syslog_handler)
Expand Down