hako 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04af6ef3ea0e6a6e2c80930324cd68f3b9a5fc2b
-  data.tar.gz: ea768f333dae15fa6375c4e3e73d33d4141dff00
+  metadata.gz: 872f90813b982a8a19c5b4cf901aa06eb401216b
+  data.tar.gz: 02e799d33ceaa061a85578b48929b2eaa4c0922c
 SHA512:
-  metadata.gz: aa664e517703a21b214062359a345292dfd0a2b92e56cfee8fd6ac59a58986e068ae46fee8b06002fbd9495b86dd3c4f53de5252f3b68acad1617cafe1d3256a
-  data.tar.gz: bf721b1a28403e98c471d53f68924fe460516bfe29657fa237d747f53274ad973ea7037e414ac5e4ecf43679bd1793ad77b71a3d275939a66b6207fe1afe8d0d
+  metadata.gz: f6089d93829d5c5866857bb10104a5a145801efd7ca3672aec0e6e58704d735416404a435b780d0f5d897a0c838de545c3ea051e060584f5a4db8a28d0aeb824
+  data.tar.gz: 50227fd8d3abfff03896b85fbb96a9deb9c53246e26c05724d9e0bc01d30cb53c70b1d3667ef782751b80da7003381ce738fa3f63cc5b8dab6c45e8acf3937a6

data/lib/hako/commander.rb

@@ -27,7 +27,9 @@ module Hako
     def oneshot(commands, tag:, containers:, env: {})
       containers = load_containers(tag, dry_run: false, with: containers)
       scheduler = load_scheduler(@app.yaml['scheduler'])
-      exit scheduler.oneshot(containers, commands, env)
+      with_oneshot_signal_handlers(scheduler) do
+        exit scheduler.oneshot(containers, commands, env)
+      end
     end
 
     def status
@@ -42,6 +44,32 @@ module Hako
 
     private
 
+    TRAP_SIGNALS = %i[INT TERM].freeze
+    class SignalTrapped < StandardError; end
+
+    def with_oneshot_signal_handlers(scheduler, &block)
+      old_handlers = {}
+      trapped = false
+
+      begin
+        TRAP_SIGNALS.each do |sig|
+          old_handlers[sig] = Signal.trap(sig) { raise SignalTrapped }
+        end
+        block.call
+      rescue SignalTrapped
+        trapped = true
+      ensure
+        old_handlers.each do |sig, command|
+          Signal.trap(sig, command)
+        end
+      end
+
+      if trapped
+        scheduler.stop_oneshot
+      end
+      nil
+    end
+
     def load_containers(tag, dry_run:, with: nil)
       app = AppContainer.new(@app, @app.yaml['app'].merge('tag' => tag), dry_run: dry_run)
       front = load_front(@app.yaml['front'], dry_run: dry_run)

data/lib/hako/schedulers/ecs.rb

@@ -22,6 +22,8 @@ module Hako
         @ec2 = Aws::EC2::Client.new(region: region)
         @force = force
         @dry_run = dry_run
+        @started_at = nil
+        @container_instance_arn = nil
       end
 
       def deploy(containers)
@@ -67,22 +69,17 @@ module Hako
         else
           Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
         end
-        task = run_task(task_definition, commands, env)
-        Hako.logger.info "Started task: #{task.task_arn}"
-        containers = wait_for_task(task)
-        Hako.logger.info 'Oneshot task finished'
-        exit_code = 127
-        containers.each do |name, container|
-          if container.exit_code.nil?
-            Hako.logger.info "#{name} has stopped without exit_code: reason=#{container.reason}"
-          else
-            Hako.logger.info "#{name} has stopped with exit_code=#{container.exit_code}"
-            if name == 'app'
-              exit_code = container.exit_code
-            end
-          end
+        @task = run_task(task_definition, commands, env)
+        Hako.logger.info "Started task: #{@task.task_arn}"
+        wait_for_oneshot_finish
+      end
+
+      def stop_oneshot
+        if @task
+          Hako.logger.warn "Stopping #{@task.task_arn}"
+          @ecs.stop_task(cluster: @cluster, task: @task.task_arn, reason: 'Stopped by hako stop_oneshot')
+          wait_for_oneshot_finish
         end
-        exit_code
       end
 
       def status
@@ -313,27 +310,43 @@ module Hako
         ).tasks[0]
       end
 
+      def wait_for_oneshot_finish
+        containers = wait_for_task(@task)
+        @task = nil
+        Hako.logger.info 'Oneshot task finished'
+        exit_code = 127
+        containers.each do |name, container|
+          if container.exit_code.nil?
+            Hako.logger.info "#{name} has stopped without exit_code: reason=#{container.reason}"
+          else
+            Hako.logger.info "#{name} has stopped with exit_code=#{container.exit_code}"
+            if name == 'app'
+              exit_code = container.exit_code
+            end
+          end
+        end
+        exit_code
+      end
+
       def wait_for_task(task)
         task_arn = task.task_arn
-        container_instance_arn = nil
-        started_at = nil
         loop do
           task = @ecs.describe_tasks(cluster: @cluster, tasks: [task_arn]).tasks[0]
-          if container_instance_arn != task.container_instance_arn
-            container_instance_arn = task.container_instance_arn
-            report_container_instance(container_instance_arn)
+          if @container_instance_arn != task.container_instance_arn
+            @container_instance_arn = task.container_instance_arn
+            report_container_instance(@container_instance_arn)
           end
-          unless started_at
-            started_at = task.started_at
-            if started_at
-              Hako.logger.info "Started at #{started_at}"
+          unless @started_at
+            @started_at = task.started_at
+            if @started_at
+              Hako.logger.info "Started at #{@started_at}"
             end
           end
 
           Hako.logger.debug "  status #{task.last_status}"
 
           if task.last_status == 'STOPPED'
-            Hako.logger.info "Stopped at #{task.stopped_at}"
+            Hako.logger.info "Stopped at #{task.stopped_at} (reason: #{task.stopped_reason})"
             containers = {}
             task.containers.each do |c|
               containers[c.name] = c

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Kohei Suzuki