Support lifecycle for aurora (#3581)

thinker0 · web-flow · commit 8f78034f4b7b · 2020-07-25T21:24:57.000-07:00
Co-authored-by: thinker0 &lt;thinker0@linecorp.com&gt;
diff --git a/heron/config/src/yaml/conf/aurora/heron.aurora b/heron/config/src/yaml/conf/aurora/heron.aurora
@@ -79,7 +79,7 @@ jobs = [
     service = True,
     task = heron_task,
     instances = '{{NUM_CONTAINERS}}',
-    announce = Announcer(primary_port = 'http', portmap = {'health': 'http'}),
+    announce = Announcer(primary_port = 'http', portmap = {'admin': 'http', 'health': 'http'}),
     health_check_config = HealthCheckConfig(
       health_checker = HealthCheckerConfig(
         http = HttpHealthChecker(endpoint='/health', expected_response='ok', expected_response_code=200)
diff --git a/heron/shell/src/python/main.py b/heron/shell/src/python/main.py
@@ -41,6 +41,8 @@
     (r"^/filestats/(.*)", handlers.FileStatsHandler),
     (r"^/download/(.*)", handlers.DownloadHandler),
     (r"^/killexecutor", handlers.KillExecutorHandler),
+    (r"^/quitquitquit", handlers.KillExecutorHandler),
+    (r"^/abortabortabort", handlers.KillExecutorHandler),
     (r"^/health", handlers.HealthHandler),
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@`
`41`	`41`	`(r"^/filestats/(.*)", handlers.FileStatsHandler),`
`42`	`42`	`(r"^/download/(.*)", handlers.DownloadHandler),`
`43`	`43`	`(r"^/killexecutor", handlers.KillExecutorHandler),`
	`44`	`+ (r"^/quitquitquit", handlers.KillExecutorHandler),`
	`45`	`+ (r"^/abortabortabort", handlers.KillExecutorHandler),`
`44`	`46`	`(r"^/health", handlers.HealthHandler),`
`45`	`47`	`]`
`46`	`48`