Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #5587 from matrix-org/erikj/fix_synctl
Browse files Browse the repository at this point in the history
Fix --no-daemonize flag for synctl
erikjohnston authored Jul 2, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents de8077a + 8134c49 commit c3863ad
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions changelog.d/5587.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add --no-daemonize option to run synapse in the foreground, per issue #4130. Contributed by Soham Gumaste.
12 changes: 6 additions & 6 deletions synctl
Original file line number Diff line number Diff line change
@@ -150,16 +150,17 @@ def main():
parser.add_argument(
"--no-daemonize",
action="store_false",
dest="daemonize",
help="Run synapse in the foreground for debugging. "
"Will work only if the daemonize option is not set in the config."
"Will work only if the daemonize option is not set in the config.",
)

options = parser.parse_args()

if options.worker and options.all_processes:
write('Cannot use "--worker" with "--all-processes"', stream=sys.stderr)
sys.exit(1)
if options.no_daemonize and options.all_processes:
if not options.daemonize and options.all_processes:
write('Cannot use "--no-daemonize" with "--all-processes"', stream=sys.stderr)
sys.exit(1)

@@ -169,9 +170,8 @@ def main():
write(
"No config file found\n"
"To generate a config file, run '%s -c %s --generate-config"
" --server-name=<server name> --report-stats=<yes/no>'\n" % (
" ".join(SYNAPSE), options.configfile,
),
" --server-name=<server name> --report-stats=<yes/no>'\n"
% (" ".join(SYNAPSE), options.configfile),
stream=sys.stderr,
)
sys.exit(1)
@@ -289,7 +289,7 @@ def main():
# Check if synapse is already running
if os.path.exists(pidfile) and pid_running(int(open(pidfile).read())):
abort("synapse.app.homeserver already running")
start(configfile, bool(options.no_daemonize))
start(configfile, bool(options.daemonize))

for worker in workers:
env = os.environ.copy()

0 comments on commit c3863ad

Please sign in to comment.