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

Merge branch 'master' of github.com:Kozea/radicale

Browse Source
This commit is contained in:
Guillaume Ayoub 2014-10-22 14:34:00 +02:00
commit 4795b004b0
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
radicale/log.py
View File

@ -28,6 +28,7 @@ import os
import sys import sys
import logging import logging
import logging.config import logging.config
import signal
from . import config from . import config
@ -35,6 +36,14 @@ from . import config
LOGGER = logging.getLogger() LOGGER = logging.getLogger()
def configure_from_file(filename, debug):
logging.config.fileConfig(filename)
if debug:
LOGGER.setLevel(logging.DEBUG)
for handler in LOGGER.handlers:
handler.setLevel(logging.DEBUG)
def start(): def start():
"""Start the logging according to the configuration.""" """Start the logging according to the configuration."""
filename = os.path.expanduser(config.get("logging", "config")) filename = os.path.expanduser(config.get("logging", "config"))
@ -42,11 +51,11 @@ def start():
if os.path.exists(filename): if os.path.exists(filename):
# Configuration taken from file # Configuration taken from file
logging.config.fileConfig(filename) configure_from_file(filename, debug)
if debug: # Reload config on SIGHUP
LOGGER.setLevel(logging.DEBUG) def handler(signum, frame):
for handler in LOGGER.handlers: configure_from_file(filename, debug)
handler.setLevel(logging.DEBUG) signal.signal(signal.SIGHUP, handler)
else: else:
# Default configuration, standard output # Default configuration, standard output
handler = logging.StreamHandler(sys.stdout) handler = logging.StreamHandler(sys.stdout)

1
radicale/storage/multifilesystem.py
View File

@ -60,6 +60,7 @@ class Collection(filesystem.Collection):
def delete(self): def delete(self):
shutil.rmtree(self._path) shutil.rmtree(self._path)
os.remove(self._props_path)
def remove(self, name): def remove(self, name):
if os.path.exists(os.path.join(self._path, name)): if os.path.exists(os.path.join(self._path, name)):