From 5b5edaac2fe8f834b17eabe8b0dc9fa77557522f Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Fri, 1 Jul 2016 10:28:51 +0200 Subject: [PATCH] Fix FCGI and WSGI scripts --- radicale.fcgi | 8 ++++---- radicale.wsgi | 8 ++++---- radicale/log.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/radicale.fcgi b/radicale.fcgi index 9e279e7..6e92b06 100755 --- a/radicale.fcgi +++ b/radicale.fcgi @@ -24,11 +24,11 @@ Launch a Radicale FastCGI server according to configuration. """ import os -import radicale from flipflop import WSGIServer +from radicale import Application, config, log -configuration = radicale.config.load([os.environ.get("RADICALE_CONFIG")]) -logger = radicale.log.start() -WSGIServer(radicale.Application(configuration, logger)).run() +configuration = config.load([os.environ.get("RADICALE_CONFIG")]) +logger = log.start() +WSGIServer(Application(configuration, logger)).run() diff --git a/radicale.wsgi b/radicale.wsgi index 5bf7c38..5b97833 100755 --- a/radicale.wsgi +++ b/radicale.wsgi @@ -22,9 +22,9 @@ Radicale WSGI file (mod_wsgi and uWSGI compliant). """ import os -import radicale +from radicale import Application, config, log -configuration = radicale.config.load([os.environ.get("RADICALE_CONFIG")]) -logger = radicale.log.start() -application = radicale.Application(configuration, logger) +configuration = config.load([os.environ.get("RADICALE_CONFIG")]) +logger = log.start() +application = Application(configuration, logger) diff --git a/radicale/log.py b/radicale/log.py index c2bd7bb..aa5c464 100644 --- a/radicale/log.py +++ b/radicale/log.py @@ -41,7 +41,7 @@ def configure_from_file(filename, debug, logger): def start(name="radicale", filename=None, debug=False): """Start the logging according to the configuration.""" logger = logging.getLogger(name) - if os.path.exists(filename): + if filename and os.path.exists(filename): # Configuration taken from file configure_from_file(logger, filename, debug) # Reload config on SIGHUP (UNIX only)