From 6b8db006b67c9afd2f2790b0854adfd2d607d9d5 Mon Sep 17 00:00:00 2001 From: System User Date: Thu, 7 Apr 2011 16:27:47 +0200 Subject: [PATCH] Log most verbose Stdout for default log output --- radicale/__init__.py | 6 +++--- radicale/config.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/radicale/__init__.py b/radicale/__init__.py index 18b5426..5253ba5 100644 --- a/radicale/__init__.py +++ b/radicale/__init__.py @@ -53,7 +53,7 @@ VERSION = "git" def _check(request, function): """Check if user has sufficient rights for performing ``request``.""" - log.log(10, "Check if user has sufficient rights for performing ``request``.") + log.log(10, "Check if user has sufficient rights for performing ``request`` %s." % (request.command)) # ``_check`` decorator can access ``request`` protected functions # pylint: disable=W0212 @@ -70,7 +70,7 @@ def _check(request, function): user = password = None if request.server.acl.has_right(request._calendar.owner, user, password): - log.log(20, "Sufficient rights for performing ``request``.") + log.log(20, "Sufficient rights for performing ``request`` %s." % (request.command)) function(request) else: log.log(40, "No sufficient rights for performing ``request``.") @@ -130,7 +130,7 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler): @property def _calendar(self): """The ``ical.Calendar`` object corresponding to the given path.""" - log.log(10, "The ``ical.Calendar`` object corresponding to the given path.") + log.log(10, "The ``ical.Calendar`` object corresponding to the given path. (%s)" % (self.path)) # ``self.path`` must be something like a posix path # ``normpath`` should clean malformed and malicious request paths attributes = posixpath.normpath(self.path.strip("/")).split("/") diff --git a/radicale/config.py b/radicale/config.py index c6bbee4..24a7cb0 100644 --- a/radicale/config.py +++ b/radicale/config.py @@ -56,7 +56,7 @@ INITIAL_CONFIG = { "storage": { "folder": os.path.expanduser("~/.config/radicale/calendars")}, "logging": { - "type": "syslog", + "type": "stdout", "logfile": os.path.expanduser("~/.config/radicale/radicale.log"), "facility": 10}, "authLdap": { @@ -73,7 +73,7 @@ for section, values in INITIAL_CONFIG.items(): _CONFIG_PARSER.set(section, key, value) _CONFIG_PARSER.read("/etc/radicale/config") -_CONFIG_PARSER.read(os.path.expanduser("~/.config/radicale/config")) +_CONFIG_PARSER.read(os.path.expdanuser("~/.config/radicale/config")) # Wrap config module into ConfigParser instance sys.modules[__name__] = _CONFIG_PARSER