tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
Unrud 2018-09-06 09:12:52 +02:00
parent e0eeae02dd
commit f1a587e9d7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
radicale/log.py
View File

@ -32,9 +32,9 @@ import sys
import threading import threading
try: try:
from systemd import journal import systemd.journal
except ImportError: except ImportError:
journal = None systemd = None
LOGGER_NAME = "radicale" LOGGER_NAME = "radicale"
LOGGER_FORMAT = "[%(ident)s] %(levelname)s: %(message)s" LOGGER_FORMAT = "[%(ident)s] %(levelname)s: %(message)s"
@ -123,9 +123,10 @@ def get_default_handler():
journal_dev, journal_ino = map( journal_dev, journal_ino = map(
int, os.environ.get("JOURNAL_STREAM", "").split(":")) int, os.environ.get("JOURNAL_STREAM", "").split(":"))
st = os.fstat(sys.stderr.fileno()) st = os.fstat(sys.stderr.fileno())
if (journal and if (systemd and
st.st_dev == journal_dev and st.st_ino == journal_ino): st.st_dev == journal_dev and st.st_ino == journal_ino):
handler = journal.JournalHandler(SYSLOG_IDENTIFIER=LOGGER_NAME) handler = systemd.journal.JournalHandler(
SYSLOG_IDENTIFIER=LOGGER_NAME)
return handler return handler
@ -137,7 +138,7 @@ def register_stream(stream):
def setup(): def setup():
"""Set global logging up.""" """Set global logging up."""
global register_stream, unregister_stream global register_stream
handler = ThreadStreamsHandler(sys.stderr, get_default_handler()) handler = ThreadStreamsHandler(sys.stderr, get_default_handler())
logging.basicConfig(format=LOGGER_FORMAT, handlers=[handler]) logging.basicConfig(format=LOGGER_FORMAT, handlers=[handler])
register_stream = handler.register_stream register_stream = handler.register_stream