diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-07 19:28:39 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-07 19:28:39 +0100 |
| commit | 7dec0b2beeca1d1b7d298dc814fcfc5aff52340c (patch) | |
| tree | 1579a8cec0170025627645ced547704cf2410605 /synapse/config/server.py | |
| parent | Batch up various DB requests for event -> state (diff) | |
| parent | Merge pull request #212 from matrix-org/erikj/cache_deferreds (diff) | |
| download | synapse-7dec0b2beeca1d1b7d298dc814fcfc5aff52340c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index f4d4a87103..f9a3b5f15b 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -24,6 +24,7 @@ class ServerConfig(Config): self.web_client = config["web_client"] self.soft_file_limit = config["soft_file_limit"] self.daemonize = config.get("daemonize") + self.print_pidfile = config.get("print_pidfile") self.use_frozen_dicts = config.get("use_frozen_dicts", True) self.listeners = config.get("listeners", []) @@ -208,12 +209,18 @@ class ServerConfig(Config): self.manhole = args.manhole if args.daemonize is not None: self.daemonize = args.daemonize + if args.print_pidfile is not None: + self.print_pidfile = args.print_pidfile def add_arguments(self, parser): server_group = parser.add_argument_group("server") server_group.add_argument("-D", "--daemonize", action='store_true', default=None, help="Daemonize the home server") + server_group.add_argument("--print-pidfile", action='store_true', + default=None, + help="Print the path to the pidfile just" + " before daemonizing") server_group.add_argument("--manhole", metavar="PORT", dest="manhole", type=int, help="Turn on the twisted telnet manhole" |