diff --git a/config b/config index b1ee131..6380a7f 100644 --- a/config +++ b/config @@ -53,7 +53,10 @@ LDAPAppend = ou=users,dc=exmaple,dc=dom folder = ~/.config/radicale/calendars [Logging] -# Logging filename +# Logging type +# Value: syslog | file | stdout +type = file +# Logging filename (if needed) logfile = ~/.config/radicale/radicale.log # Log facility 10: DEBUG, 20: INFO, 30 WARNING, 40 ERROR, 50 CRITICAL facility = 50 diff --git a/radicale/config.py b/radicale/config.py index 74a315e..17735a0 100644 --- a/radicale/config.py +++ b/radicale/config.py @@ -56,7 +56,7 @@ INITIAL_CONFIG = { "storage": { "folder": os.path.expanduser("~/.config/radicale/calendars")}, "logging": { - "logfile": os.path.expanduser("~/.config/radicale/radicale.log"), + "type": "syslog", "facility": 10}, "authLdap": { "LDAPServer": "127.0.0.1", diff --git a/radicale/log.py b/radicale/log.py index 072857a..2692a7e 100644 --- a/radicale/log.py +++ b/radicale/log.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import logging, sys +from logging.handlers import SysLogHandler from radicale import config class log: @@ -8,8 +9,14 @@ class log: self.logger=logging.getLogger("radicale") self.logger.setLevel(config.get("logging", "facility")) - handler=logging.FileHandler(config.get("logging", "logfile")) - + loggingType=config.get("logging", "type") + if loggingType == "stdout": + handler=logging.StreamHandler(sys.stdout) + elif loggingType == "file": + handler=logging.FileHandler(config.get("logging", "logfile")) + else: + handler=logging.handlers.SysLogHandler("/dev/log") + formatter = logging.Formatter('%(name)s %(asctime)s %(levelname)s %(message)s') handler.setFormatter(formatter) diff --git a/radicale/xmlutils.py b/radicale/xmlutils.py index 4bbee01..621b7ac 100644 --- a/radicale/xmlutils.py +++ b/radicale/xmlutils.py @@ -86,7 +86,7 @@ def propfind(path, xml_request, calendar, depth): """Read and answer PROPFIND requests. Read rfc4918-9.1 for info. - + """ # Reading request log.log(10, "Read and answer PROPFIND requests.")