Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale

Conflicts:
	radicale/__init__.py

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``.")
@@ -148,7 +148,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("/")

radicale/config.py

@@ -55,7 +55,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": {
@@ -72,7 +72,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