frontkick 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b112f355e7130d374cbe37602fcba01a33d63b48
-  data.tar.gz: 29951a2c3981fcc6d5cc802894fb8247440a1a63
+  metadata.gz: 3c05169903b48aeb4fd103f0f8eeac55b2c0b670
+  data.tar.gz: fc7d0c173417b7f3f4c24b0551a35a3b43b7b534
 SHA512:
-  metadata.gz: d73e071d663f8494d6beecd12c68bd3d7eb448fa3fff2f848a5f5ab9669dd320c1a0ac178aac26b2f4d7c7bb840342efe167260129d68ffa5d1b72e8aaa06a62
-  data.tar.gz: be8919c5ffd4aaea0d320ae0c749612b2b5b8477cba5684b4e485c91aca2ccd679e50c9ac69275843cdb6139764935009bc68dba8e910a731b15cd01c62a47a0
+  metadata.gz: ea20bd4b9dddee6bb5ab47f43c9334ec0d6ce1cde77a9b6660110ce32351a6bf31f699dd72e5d5d757baa964ff0483606082b61131762e489d0da6132f807963
+  data.tar.gz: 3cd1984f02b98b548190c0a37843c2ceee42ee79ed89149f036f18f376f519c793fbcf0675c028c931b8c015e3883b411804d2a0751f00d2fe3cf8aa9e89782d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.7 (2016/01/22)
+
+Enhancements:
+
+- Add kill_child option
+
 # 0.4.6 (2016/01/07)
 
 Fixes:

data/README.md

@@ -54,6 +54,14 @@ If you prefer to be blocked:
 
     Frontkick.exec("sleep 2 && ls /hoge", :exclusive => "/tmp/frontkick.lock", :exclusive_blocking => true)
 
+### Kill Child Option
+
+On receiving INT and TERM signal, kill the kicked child process before exiting
+
+    Frontkick.exec("sleep 100", :kill_child => true)
+
+NOTE: This uses Kernel.trap inside.
+
 ### Hint: Redirect stderr to stdout
 
 Frontkick itself does not aid anything, but you can do as

data/example/kill_child.rb

@@ -0,0 +1,5 @@
+require 'frontkick'
+
+puts Process.pid
+result = Frontkick.exec(["sleep 3000"], :kill_child => true)
+puts result.stdout

data/lib/frontkick/command.rb

@@ -26,10 +26,18 @@ module Frontkick
             err_reader = Thread.new { err.read }
             stdin.close
             pid = wait_thr.pid
+
+            trapped_signal = nil
+            if opts[:kill_child]
+              trap_signal(pid) {|sig| trapped_signal = sig }
+            end
+
             stdout = out_reader.value
             stderr = err_reader.value
             exit_code = wait_thr.value.exitstatus
             process_wait(pid)
+
+            exit_signal(trapped_signal) if trapped_signal
           end
         end
       rescue Frontkick::TimeoutLocal => e
@@ -50,6 +58,28 @@ module Frontkick
       Result.new(:stdout => stdout, :stderr => stderr, :exit_code => exit_code, :duration => duration)
     end
 
+    def self.trap_signal(pid)
+      trap :INT do
+        Process.kill(:INT, pid)
+        yield(:INT)
+      end
+      trap :TERM do
+        Process.kill(:TERM, pid)
+        yield(:TERM)
+      end
+    end
+
+    def self.exit_signal(signal)
+      case signal
+      when :INT
+        exit(130)
+      when :TERM
+        exit(143)
+      else
+        raise 'Non supported signal'
+      end
+    end
+
     def self.process_wait(pid)
       begin
         pid, status = Process.waitpid2(pid) # wait child processes finish

data/lib/frontkick/version.rb

@@ -1,3 +1,3 @@
 module Frontkick
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frontkick
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,6 +68,7 @@ files:
 - README.md
 - Rakefile
 - example/dry_run.rb
+- example/kill_child.rb
 - example/run.rb
 - experiment/capture3_no_deadlock.rb
 - experiment/cat_63k.rb