catdog2/pelican-deployment-system
1
0
Fork 0
mirror of https://github.com/IEEE-SB-Passau/pelican-deployment-system.git synced 2017-09-06 16:35:38 +02:00
Code Activity

better shutdown handling

Browse Source
This commit is contained in:
Peter Dahlberg
2016-06-13 23:10:52 +02:00
parent ab13e51237
commit ec8e597425
3 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
develop_main.py
View File

@@ -5,10 +5,11 @@ from apscheduler.schedulers.background import BackgroundScheduler
from importlib.machinery import SourceFileLoader from importlib.machinery import SourceFileLoader
from operator import methodcaller from operator import methodcaller
from bottle import run, default_app from bottle import run, default_app
from wsgiref.simple_server import make_server
import pelican_deploy.webhookbottle import pelican_deploy.webhookbottle
import logging import logging
import atexit
import sys
if __name__ == "__main__": if __name__ == "__main__":
@@ -20,21 +21,33 @@ if __name__ == "__main__":
#for r in runners.values(): #for r in runners.values():
# print(r.build(wait=True)) # print(r.build(wait=True))
schedulers = {r: BackgroundScheduler(daemon=False) for r in runners} for r in runners.values():
atexit.register(r.shutdown) # finally, wait for builds to finish
for r in runners.values():
atexit.register(r.try_abort_build) # then try to abort running builds
schedulers = {r: BackgroundScheduler(daemon=True) for r in runners}
for s in schedulers.values(): for s in schedulers.values():
s.start() s.start()
atexit.register(s.shutdown) # first stop the schedulers
atexit.register(print,
"<><><><><><><><><><><><><><><><><><><><><><><><><>\n",
">>>>> Shutting down gracefully, please wait! <<<<<\n",
"<><><><><><><><><><><><><><><><><><><><><><><><><>",
file=sys.stderr, sep="")
for i, (rname, trigger) in enumerate(config.SCHEDULED_BUILD_JOBS): for i, (rname, trigger) in enumerate(config.SCHEDULED_BUILD_JOBS):
schedulers[rname].add_job(runners[rname].build, trigger=trigger, schedulers[rname].add_job(runners[rname].build,
trigger=trigger,
name="{} ({})".format(rname, i), name="{} ({})".format(rname, i),
id="{}_{}".format(rname, i), max_instances=1, id="{}_{}".format(rname, i),
kwars={"wait" : True}) max_instances=1,
kwars={"wait": True})
pelican_deploy.webhookbottle.set_runners(**runners) pelican_deploy.webhookbottle.set_runners(**runners)
pelican_deploy.webhookbottle.set_github_secret(config.GITHUB_SECRET) pelican_deploy.webhookbottle.set_github_secret(config.GITHUB_SECRET)
default_app().mount("/hooks/", pelican_deploy.webhookbottle.app) default_app().mount("/hooks/", pelican_deploy.webhookbottle.app)
run(host='0.0.0.0', port=4000, debug=True) run(host='0.0.0.0', port=4000, debug=True)

15
pelican_deploy/deploy.py
View File

@@ -10,7 +10,6 @@ import sys
import logging import logging
import shlex import shlex
import os import os
import atexit
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -137,11 +136,10 @@ class DeploymentRunner:
def final_install(self): def final_install(self):
args = shlex.split(self.final_install_command) args = shlex.split(self.final_install_command)
log.info("%s: Starting final_install `%s`", self.name, args) log.info("%s: Starting final_install `%s`", self.name, args)
proc = Popen(args, stdout=PIPE, stderr=PIPE, universal_newlines=True) proc = Popen(args, stdout=PIPE, stderr=PIPE, universal_newlines=True,
atexit.register(proc.kill) start_new_session=True)
outs, errs = proc.communicate() outs, errs = proc.communicate()
status = proc.wait() status = proc.wait()
atexit.unregister(proc.kill)
if status < 0: if status < 0:
log.info("%s: killed final_install_command (%s)", self.name, status) log.info("%s: killed final_install_command (%s)", self.name, status)
@@ -169,11 +167,10 @@ class DeploymentRunner:
self._build_proc = Popen(args, stdout=PIPE, stderr=PIPE, self._build_proc = Popen(args, stdout=PIPE, stderr=PIPE,
cwd=str(self.build_repo_path), cwd=str(self.build_repo_path),
env=self._build_proc_env, env=self._build_proc_env,
universal_newlines=True) universal_newlines=True,
atexit.register(self._build_proc.kill) start_new_session=True)
outs, errs = self._build_proc.communicate() outs, errs = self._build_proc.communicate()
status = self._build_proc.wait() status = self._build_proc.wait()
atexit.unregister(self._build_proc.kill)
if status < 0: if status < 0:
log.info("%s: killed build_command", self.name) log.info("%s: killed build_command", self.name)
@@ -184,3 +181,7 @@ class DeploymentRunner:
log.info('%s build_command stderr: %s\n', self.name, errs) log.info('%s build_command stderr: %s\n', self.name, errs)
if status == 0: if status == 0:
self.final_install() self.final_install()
def shutdown(self):
self.try_abort_build()
self._executor.shutdown(wait=True)

3
pelican_deploy/gittool.py
View File

@@ -41,7 +41,8 @@ class Repo:
def popen_cmd(self, *args, env=None, universal_newlines=True): def popen_cmd(self, *args, env=None, universal_newlines=True):
return Popen(args, stdout=PIPE, stderr=PIPE, cwd=self.repo_dir, env=env, return Popen(args, stdout=PIPE, stderr=PIPE, cwd=self.repo_dir, env=env,
universal_newlines=universal_newlines) universal_newlines=universal_newlines,
start_new_session=True)
def is_bare(self): def is_bare(self):
result = self.rev_parse("--is-bare-repository") result = self.rev_parse("--is-bare-repository")