hive-runner 2.1.26 → 2.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad70ec960f421f7fe4345b0e38009b4bdcb9a0e9
-  data.tar.gz: b4b58e12fbd9b3e779c82c8f17e5389253efdd3d
+  metadata.gz: b3302ae2a64590d9f205a92748ab4dd15168af0f
+  data.tar.gz: 3bde86d13078501ca242ca19ae155cdf587145c6
 SHA512:
-  metadata.gz: 85a57f836dfd1ef46bfa80ead6f5bcbf8bffe10adbada4c5f5c9ab556d22ead8ae231f69c8396b0c89cfaaec5ff1fa07ffd6d9cd64a35d1a38d4b752bff4e37f
-  data.tar.gz: 387013f1b155ff46cedf66144dbd3fc70718dba5559ddc8e6a21a5b930b4783a7aea5958d3a752c1f1d37391b53ea27cfa656ec7b83fe1d662a612e486d88071
+  metadata.gz: 06537e131a338ad1688c5ce7f98b67f6876222a2dcab417e2d071f58a99b726c0704a32415eeba8f17467b917284f8f8e14dfc69a8fda770f77a7a02f825fa58
+  data.tar.gz: cd8d1db47eb7bdcf61aa8d8ea8ee524f527427e1a72abfce90f76413b8044618a67ff70bd0596cc292f9b3e1114105deba1c7aa82ed16684be33ce8e105f6ce6

data/lib/hive/device.rb

@@ -34,24 +34,31 @@ module Hive
 
     # Terminate the worker process
     def stop
-      @stop_count = @stop_count.nil? ? 0 : @stop_count + 1
+      protect_file = File.expand_path("#{@worker_pid}.protect", PIDS_DIRECTORY)
+      Hive.logger.debug("Checking for protected file: #{protect_file}")
+      if File.exists? File.expand_path("#{@worker_pid}.protect", PIDS_DIRECTORY)
+        Hive.logger.debug("PID #{@worker_pid} is protected")
+        false
+      else
+        @stop_count = @stop_count.nil? ? 0 : @stop_count + 1
 
-      if self.running?
-        if @stop_count < 30
-          Hive.logger.info("Attempting to terminate process #{@worker_pid} [#{@stop_count}]")
-          Process.kill 'TERM', @worker_pid
-        else
-          Hive.logger.info("Killing process #{@worker_pid}")
-          Process.kill 'KILL', @worker_pid if self.running?
+        if self.running?
+          if @stop_count < 30
+            Hive.logger.info("Attempting to terminate process #{@worker_pid} [#{@stop_count}]")
+            Process.kill 'TERM', @worker_pid
+          else
+            Hive.logger.info("Killing process #{@worker_pid}")
+            Process.kill 'KILL', @worker_pid if self.running?
+          end
         end
-      end
 
-      if self.running?
-        false
-      else
-        @worker_pid = nil
-        @stop_count = nil
-        true
+        if self.running?
+          false
+        else
+          @worker_pid = nil
+          @stop_count = nil
+          true
+        end
       end
     end
 

data/lib/hive/worker.rb

@@ -8,6 +8,7 @@ require 'hive/messages'
 require 'hive/port_allocator'
 require 'code_cache'
 require 'res'
+require 'fileutils'
 
 module Hive
   # The generic worker class
@@ -249,7 +250,9 @@ module Hive
     # Diagnostics function to be extended in child class, as required
     def diagnostics
       retn = true
+      protect
       retn = @diagnostic_runner.run if !@diagnostic_runner.nil?
+      unprotect
       @log.info('Diagnostics failed') if not retn
       status = device_status
       status = set_device_status('happy') if status == 'busy'
@@ -500,5 +503,18 @@ module Hive
     def hive_mind_device_identifiers
       { id: @device_id }
     end
+
+    private
+    def protect
+      @protect_file = File.expand_path("#{Process.pid}.protect", PIDS_DIRECTORY)
+      @log.debug("Protecting worker with #{@protect_file}")
+      FileUtils.touch @protect_file
+    end
+
+    def unprotect
+      @log.debug("Unprotecting worker with #{@protect_file}")
+      File.unlink @protect_file if @protect_file
+      @protect_file = nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.26
+  version: 2.1.27
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber