Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the daemonize key from the config if it exists

This commit is contained in:
Mark Haines 2015-05-01 14:34:48 +01:00
parent 9eeb03c0dd
commit 3bcdf3664c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/config/server.py
View File

@ -27,6 +27,7 @@ class ServerConfig(Config):
self.pid_file = self.abspath(config.get("pid_file")) self.pid_file = self.abspath(config.get("pid_file"))
self.web_client = config["web_client"] self.web_client = config["web_client"]
self.soft_file_limit = config["soft_file_limit"] self.soft_file_limit = config["soft_file_limit"]
self.daemonize = config.get("daemonize")
# Attempt to guess the content_addr for the v0 content repostitory # Attempt to guess the content_addr for the v0 content repostitory
content_addr = config.get("content_addr") content_addr = config.get("content_addr")
@ -89,11 +90,13 @@ class ServerConfig(Config):
def read_arguments(self, args): def read_arguments(self, args):
if args.manhole is not None: if args.manhole is not None:
self.manhole = args.manhole self.manhole = args.manhole
if args.daemonize is not None:
self.daemonize = args.daemonize self.daemonize = args.daemonize
def add_arguments(self, parser): def add_arguments(self, parser):
server_group = parser.add_argument_group("server") server_group = parser.add_argument_group("server")
server_group.add_argument("-D", "--daemonize", action='store_true', server_group.add_argument("-D", "--daemonize", action='store_true',
default=None,
help="Daemonize the home server") help="Daemonize the home server")
server_group.add_argument("--manhole", metavar="PORT", dest="manhole", server_group.add_argument("--manhole", metavar="PORT", dest="manhole",
type=int, type=int,