oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-09-15 20:36:55 +00:00
Code Wiki Activity

Merge pull request #402 from Unrud/locking

Browse source 
Implement locking of whole storage
This commit is contained in:
Guillaume Ayoub 2016-05-25 14:03:48 +02:00
commit a3c32ee77f
3 changed files with 175 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
radicale/__main__.py
View file

@ -33,7 +33,8 @@ import ssl
from wsgiref.simple_server import make_server
from . import (
Application, config, HTTPServer, HTTPSServer, log, RequestHandler, VERSION)
Application, config, ThreadedHTTPServer, ThreadedHTTPSServer, log,
RequestHandler, VERSION)
# This is a script, many branches and variables
@ -152,7 +153,7 @@ def run():
# Create collection servers
servers = {}
if configuration.getboolean("server", "ssl"):
server_class = HTTPSServer
server_class = ThreadedHTTPSServer
server_class.certificate = configuration.get("server", "certificate")
server_class.key = configuration.get("server", "key")
server_class.cyphers = configuration.get("server", "cyphers")
@ -168,7 +169,7 @@ def run():
"Error while reading SSL %s %r: %s" % (
name, filename, exception))
else:
server_class = HTTPServer
server_class = ThreadedHTTPServer
if not configuration.getboolean("server", "dns_lookup"):
RequestHandler.address_string = lambda self: self.client_address[0]