runaway 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2394ae85e1bcf9ff2046d3892f33ece782e2e22
-  data.tar.gz: 4838053519c1500f34bef114eb374a2b05af9833
+  metadata.gz: ee88a2e47d1bf2847893a4b258d236efcfff3fae
+  data.tar.gz: f3edef5cc5fae9363f1d56978c0465b56faa0a24
 SHA512:
-  metadata.gz: 50c6402a8d00358139c9e93e37a02a4d34819e63ea6c7f00b27e6b544107af71d1a60b14671c2115c6d04565fe0d3a4f0310c2c79a3f100c453436f61b2e0a24
-  data.tar.gz: 8555a4a081a964299e1866ee00bb0728984a87303add7f89b708a26429006f28721064d21bbe7e95dfd5f0a4106590de288a491e68e0796eb5170f87bad65f9a
+  metadata.gz: 0489708f0657aeb6e7b91c7f23e2007974d22577afe01b9c04b2dca6d12a9fcdbdf68cdbb965b75970351333eab45ec6a1599f3d34a3727abda9f8daa47ab248
+  data.tar.gz: 34eeca38ad28dfb7b205a40b9517f3b3123683a9fdd466031b848bd1780f9b67e1b477c3a1d10104b412b36ee80df21c33e1ab2dfcf5af799e0b0f86963d3ede

data/lib/runaway.rb

@@ -1,7 +1,7 @@
 require 'securerandom'
 
 module Runaway
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
   
   UncleanExit = Class.new(StandardError)
   Child = Class.new(StandardError)
@@ -49,9 +49,12 @@ module Runaway
       (Process.kill(sig, child_pid) rescue Errno::ESRCH) if !has_quit
     }
     
+    last_heartbeat_sent = started_at
     begin
       loop do
-        sleep heartbeat_interval
+        sleep 0.5
+        
+        break if has_quit
         
         # First check if it has exceeded it's wall clock time allowance
         running_for = Time.now - started_at
@@ -60,6 +63,11 @@ module Runaway
             child_pid, running_for, must_quit_within])
         end
         
+        # Then check if it is time to poke it with a heartbeat
+        at = Time.now
+        next if (at - last_heartbeat_sent) < heartbeat_interval
+        last_heartbeat_sent = at
+        
         # Then send it the USR2 as a "ping", and expect a "pong" in
         # the form of a pipe write. If the pipe is still not readable
         # after a certain time, we assume the process has hung.

data/runaway.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: runaway 1.0.0 ruby lib
+# stub: runaway 1.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "runaway"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2016-02-26"
+  s.date = "2016-03-01"
   s.description = "Spin off blocks in child processes and make sure they terminate on time"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [

data/spec/runaway_spec.rb

@@ -17,15 +17,17 @@ describe "Runaway" do
     end
   end
   
-  context 'with a process that sleeps for too long' do
+  context 'with a process that exceeds the maximum runtime' do
     it 'terminates the process' do
+      start_at = Time.now
       expect {
         Runaway.spin(must_quit_within: 3) do
-          sleep 4
+          sleep 30
         end
       }.to raise_error {|err|
         expect(err).to be_kind_of(Runaway::RuntimeExceeded)
-        expect(err.message).to match(/\d+ did not terminate after 4 secs \(limited to 3 secs\)/)
+        expect(err.message).to match(/\d+ did not terminate after \d+ secs \(limited to 3 secs\)/)
+        expect(Time.now - start_at).to be < 5 # Ensure it was killed quickly
       }
     end
   end
@@ -41,13 +43,26 @@ describe "Runaway" do
     end
   end
   
+  context 'when a process terminates before the first heartbeat has to be dispatched' do
+    it 'just returns :done' do
+      t = Time.now
+      return_token = Runaway.spin(heartbeat_interval: 5) { sleep 0.1 }
+      expect(return_token).to eq(:done)
+      delta = Time.now - t
+      expect(delta).to be < 2
+    end
+  end
+  
   context 'when a process stops responding to heartbeats' do
-    it 'raises an error' do
+    it 'kills it quickly and raises an error' do
+      t = Time.now
       expect {
-        Runaway.spin { trap('USR2', 'DEFAULT'); trap('USR2') {}; sleep 7 }
+        # Delete, then override the USR2 trap so that heartbeats do not get handled at all
+        Runaway.spin(heartbeat_interval: 0.8) { trap('USR2', 'DEFAULT'); trap('USR2') {}; sleep 45 }
       }.to raise_error {|err|
         expect(err).to be_kind_of(Runaway::HeartbeatTimeout)
-        expect(err.message).to match(/\d+ did not reply to heartbeat after 4 secs/)
+        expect(err.message).to match(/\d+ did not reply to heartbeat after \d+ secs/)
+        expect(Time.now - t).to be < 5 # should really ahve killed it fast
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runaway
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec