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

Clean command-line options management

Browse Source
This commit is contained in:
Guillaume Ayoub 2011-04-02 22:09:43 +02:00
parent 48be062d38
commit c0317c6817
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
radicale.py
View File

@ -26,10 +26,9 @@
# pylint: disable-msg=W0406 # pylint: disable-msg=W0406
""" """
Radicale Server entry point. Radicale CalDAV Server.
Launch the Radicale Server according to configuration and command-line Launch the server according to configuration and command-line options.
arguments.
""" """
@ -44,11 +43,7 @@ import threading
import radicale import radicale
# Get command-line options # Get command-line options
parser = optparse.OptionParser() parser = optparse.OptionParser(version=radicale.VERSION)
parser.add_option(
"-v", "--version", action="store_true",
default=False,
help="show version and exit")
parser.add_option( parser.add_option(
"-d", "--daemon", action="store_true", "-d", "--daemon", action="store_true",
default=radicale.config.getboolean("server", "daemon"), default=radicale.config.getboolean("server", "daemon"),
@ -59,7 +54,7 @@ parser.add_option(
parser.add_option( parser.add_option(
"-H", "--hosts", "-H", "--hosts",
default=radicale.config.get("server", "hosts"), default=radicale.config.get("server", "hosts"),
help="set server hostnames") help="set server hostnames and ports")
parser.add_option( parser.add_option(
"-s", "--ssl", action="store_true", "-s", "--ssl", action="store_true",
default=radicale.config.getboolean("server", "ssl"), default=radicale.config.getboolean("server", "ssl"),
@ -70,11 +65,11 @@ parser.add_option(
parser.add_option( parser.add_option(
"-k", "--key", "-k", "--key",
default=radicale.config.get("server", "key"), default=radicale.config.get("server", "key"),
help="private key file ") help="set private key file")
parser.add_option( parser.add_option(
"-c", "--certificate", "-c", "--certificate",
default=radicale.config.get("server", "certificate"), default=radicale.config.get("server", "certificate"),
help="certificate file ") help="set certificate file")
options = parser.parse_args()[0] options = parser.parse_args()[0]
# Update Radicale configuration according to options # Update Radicale configuration according to options
@ -84,11 +79,6 @@ for option in parser.option_list:
value = getattr(options, key) value = getattr(options, key)
radicale.config.set("server", key, value) radicale.config.set("server", key, value)
# Print version and exit if the option is given
if options.version:
print(radicale.VERSION)
sys.exit()
# Fork if Radicale is launched as daemon # Fork if Radicale is launched as daemon
if options.daemon: if options.daemon:
if os.fork(): if os.fork():