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

Commit

Permalink
synctl warns when no process is stopped and avoids start (#6598)
Browse files Browse the repository at this point in the history
* If an error occurs when stopping a process synctl now logs a warning.
* During a restart, synctl will avoid attempting to start Synapse if an error
  occurs during stopping Synapse.
  • Loading branch information
romainbou authored May 19, 2020
1 parent ab3e19d commit a57863d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
1 change: 1 addition & 0 deletions changelog.d/6590.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`synctl` now warns if it was unable to stop Synapse and will not attempt to start Synapse if nothing was stopped. Contributed by Romain Bouyé.
31 changes: 28 additions & 3 deletions synctl
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,38 @@ def start_worker(app: str, configfile: str, worker_configfile: str) -> bool:
return False


def stop(pidfile, app):
def stop(pidfile: str, app: str) -> bool:
"""Attempts to kill a synapse worker from the pidfile.
Args:
pidfile: path to file containing worker's pid
app: name of the worker's appservice
Returns:
True if the process stopped successfully
False if process was already stopped or an error occured
"""

if os.path.exists(pidfile):
pid = int(open(pidfile).read())
try:
os.kill(pid, signal.SIGTERM)
write("stopped %s" % (app,), colour=GREEN)
return True
except OSError as err:
if err.errno == errno.ESRCH:
write("%s not running" % (app,), colour=YELLOW)
elif err.errno == errno.EPERM:
abort("Cannot stop %s: Operation not permitted" % (app,))
else:
abort("Cannot stop %s: Unknown error" % (app,))
return False
else:
write(
"No running worker of %s found (from %s)\nThe process might be managed by another controller (e.g. systemd)"
% (app, pidfile),
colour=YELLOW,
)
return False


Worker = collections.namedtuple(
Expand Down Expand Up @@ -300,11 +319,17 @@ def main():
action = options.action

if action == "stop" or action == "restart":
has_stopped = True
for worker in workers:
stop(worker.pidfile, worker.app)
if not stop(worker.pidfile, worker.app):
# A worker could not be stopped.
has_stopped = False

if start_stop_synapse:
stop(pidfile, "synapse.app.homeserver")
if not stop(pidfile, "synapse.app.homeserver"):
has_stopped = False
if not has_stopped:
sys.exit(1)

# Wait for synapse to actually shutdown before starting it again
if action == "restart":
Expand Down

0 comments on commit a57863d

Please sign in to comment.