- Add parser argument "--no-daemonize" Signed-off-by: sohamg <sohamg2@gmail.com>pull/5412/head
parent
c831748f4d
commit
ab157e61a2
18
synctl
18
synctl
|
@ -69,10 +69,14 @@ def abort(message, colour=RED, stream=sys.stderr):
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
def start(configfile):
|
def start(configfile, daemonize = True):
|
||||||
write("Starting ...")
|
write("Starting ...")
|
||||||
args = SYNAPSE
|
args = SYNAPSE
|
||||||
args.extend(["--daemonize", "-c", configfile])
|
|
||||||
|
if daemonize:
|
||||||
|
args.extend(["--daemonize", "-c", configfile])
|
||||||
|
else:
|
||||||
|
args.extend(["-c", configfile])
|
||||||
|
|
||||||
try:
|
try:
|
||||||
subprocess.check_call(args)
|
subprocess.check_call(args)
|
||||||
|
@ -143,12 +147,20 @@ def main():
|
||||||
help="start or stop all the workers in the given directory"
|
help="start or stop all the workers in the given directory"
|
||||||
" and the main synapse process",
|
" and the main synapse process",
|
||||||
)
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--no-daemonize",
|
||||||
|
action="store_false",
|
||||||
|
help="Run synapse in the foreground (for debugging)"
|
||||||
|
)
|
||||||
|
|
||||||
options = parser.parse_args()
|
options = parser.parse_args()
|
||||||
|
|
||||||
if options.worker and options.all_processes:
|
if options.worker and options.all_processes:
|
||||||
write('Cannot use "--worker" with "--all-processes"', stream=sys.stderr)
|
write('Cannot use "--worker" with "--all-processes"', stream=sys.stderr)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
if options.no_daemonize and options.all_processes:
|
||||||
|
write('Cannot use "--no-daemonize" with "--all-processes"', stream=sys.stderr)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
configfile = options.configfile
|
configfile = options.configfile
|
||||||
|
|
||||||
|
@ -276,7 +288,7 @@ def main():
|
||||||
# Check if synapse is already running
|
# Check if synapse is already running
|
||||||
if os.path.exists(pidfile) and pid_running(int(open(pidfile).read())):
|
if os.path.exists(pidfile) and pid_running(int(open(pidfile).read())):
|
||||||
abort("synapse.app.homeserver already running")
|
abort("synapse.app.homeserver already running")
|
||||||
start(configfile)
|
start(configfile, bool(options.no_daemonize))
|
||||||
|
|
||||||
for worker in workers:
|
for worker in workers:
|
||||||
env = os.environ.copy()
|
env = os.environ.copy()
|
||||||
|
|
Loading…
Reference in New Issue