acpc_table_manager 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40cdacd266e472effa1e421f0d6a309c9dc4572c
-  data.tar.gz: f59f137e26e6a42a81564ce9f48d13f43bcd2d3f
+  metadata.gz: 5fa5f98954ab8a4efc2090a89478d447a2d2a9c0
+  data.tar.gz: 8e2eaa55099066e62d89c583796966ef4432eaa6
 SHA512:
-  metadata.gz: 9015fb9855b15b5e0935f2cd7030c5e9027c364caaaca0161226b702c25e543a4e385496e224badaaddb8eb1fff64c8142a0ffb27e28a199b453862c2a4cb9b2
-  data.tar.gz: a2dc237858e18e7c1344e630765ad93f11abfc659a907822028406c95dc0c40c318992348d59a71db470a74d71069ff012fba36cffea129ae6352bc6b190d6b7
+  metadata.gz: 7ec7782bc01519101d88bebc6b16cdffc2333192f8024b220bdf93c0e9b859f9f4652f2f475d9c386084b024df7399662f2682d23931e69856723ff5b5cd3cad
+  data.tar.gz: b9ab7094f9e74de741009b8c550cd348b6cd679c26c2ba138c223bcbed48a27fb976236b1ddaea9c558bfb5bdfa21b2717db71b6dc4c9386100d87274008f898

data/lib/acpc_table_manager/maintainer.rb

@@ -24,27 +24,45 @@ module AcpcTableManager
       end
     end
 
-    def self.kill_orphan_proxies(pids, pids_file)
-      new_pids = []
-      pids.each do |pid_pair|
-        if AcpcDealer::process_exists?(pid_pair['proxy']) && !AcpcDealer::process_exists?(pid_pair['dealer'])
-          AcpcDealer::kill_process pid_pair['proxy']
+    def self.kill_process_if_running(pid)
+      begin
+        AcpcDealer::kill_process pid
+        sleep 1 # Give the process a chance to exit
+
+        if AcpcDealer::process_exists?(pid)
+          AcpcDealer::force_kill_process pid
           sleep 1 # Give the process a chance to exit
 
-          if AcpcDealer::process_exists?(pid_pair['proxy'])
-            AcpcDealer::force_kill_process pid_pair['proxy']
-            sleep 1 # Give the process a chance to exit
+          if AcpcDealer::process_exists?(pid)
+            yield if block_given?
+          end
+        end
+      rescue Errno::ESRCH
+      end
+    end
 
-            if AcpcDealer::process_exists?(pid_pair['proxy'])
-              raise(
-                StandardError.new(
-                  "Proxy process #{pid_pair['proxy']} couldn't be killed!"
-                )
+    def self.kill_orphan_proxies(pids, pids_file)
+      new_pids = []
+      pids.each do |pid_pair|
+        proxy_running = AcpcDealer::process_exists?(pid_pair['proxy'])
+        if proxy_running && AcpcDealer::process_exists?(pid_pair['dealer'])
+          new_pids << pid_pair
+        elsif proxy_running
+          kill_process_if_running pid_pair['proxy'] do
+            raise(
+              StandardError.new(
+                "Proxy process #{pid_pair['proxy']} couldn't be killed!"
               )
-            end
+            )
           end
         else
-          new_pids << pid_pair
+          kill_process_if_running pid_pair['dealer'] do
+            raise(
+              StandardError.new(
+                "Dealer process #{pid_pair['dealer']} couldn't be killed!"
+              )
+            )
+          end
         end
       end
       new_pids

data/lib/acpc_table_manager/table_queue.rb

@@ -45,7 +45,7 @@ module AcpcTableManager
       opponents = match.bots(AcpcTableManager.config.dealer_host)
 
       if opponents.empty?
-        kill_match! match.id.to_s
+        force_kill_match! match.id.to_s
         raise StandardError.new("No opponents found to start for #{match.id.to_s}! Killed match.")
       end
 

data/lib/acpc_table_manager/version.rb

@@ -1,3 +1,3 @@
 module AcpcTableManager
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_table_manager
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony