acpc_table_manager 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae4c95c398a2a4e37af68c745df3a8cc01e497eb
-  data.tar.gz: 9d943fd5ce79caa6954adab48d457ecc342b3282
+  metadata.gz: 1d70b98f25734162aa73784163ad9b0ad4e1da2f
+  data.tar.gz: 27922143aa8c9b314f5b9cdd3e1dc2e6a403ecf0
 SHA512:
-  metadata.gz: a0d92d83354645d1ad473773bd5e84a967bf57997ee680e73dc295f895df4ceb653c8d9ed47514b9e66f9f19dbd10786634c0223607a34b6897a67a90afd20bc
-  data.tar.gz: d76abf15aff63463c490c0d1d9b7b9c5437d61d63a2ea37520c983eb075e495d201573aa277b98130f83f9b97270e2b5cbe2bec51987bdb6f9c3a02429149a66
+  metadata.gz: 23681008e962526b537672c7db5ce846b626fae93629e85492df5d1f1db5cc562df324005df211dfacb739c99f716a7f30f647a4ced07a538ecac82463c9dcbd
+  data.tar.gz: c3a40095295e2136f4d06a2e364054dfcb90783be7ab20fd22d70a754ba5e4f164cb1458e11c3c2490e8f7c51c44b1d9433b7274fb08f527c770dad5d94c5dca

data/exe/acpc_proxy

@@ -89,8 +89,8 @@ begin
     end
     match = AcpcTableManager::Match.find options[:match_id]
     if proxy.match_ended? or !match.dealer_running?
-      match.proxy_pid = -1
-      match.dealer_pid = -1
+      match.proxy_pid = nil
+      match.dealer_pid = nil
       match.save!
       exit
     end

data/lib/acpc_table_manager/match.rb

@@ -49,11 +49,15 @@ class Match
 
   class << self
     # @todo Move to AcpcDealer
-    def kill_process_if_running(pid)
-      begin
+    def safe_kill(pid)
+      if pid && pid > 0
         AcpcDealer::kill_process pid
         sleep 1 # Give the process a chance to exit
-
+      end
+    end
+    def kill_process_if_running(pid)
+      begin
+        safe_kill pid
         if AcpcDealer::process_exists?(pid)
           AcpcDealer::force_kill_process pid
           sleep 1 # Give the process a chance to exit
@@ -216,8 +220,8 @@ class Match
   field :port_numbers, type: Array
   field :random_seed, type: Integer, default: new_random_seed
   field :last_slice_viewed, type: Integer, default: -1
-  field :dealer_pid, type: Integer, default: -1
-  field :proxy_pid, type: Integer, default: -1
+  field :dealer_pid, type: Integer, default: nil
+  field :proxy_pid, type: Integer, default: nil
   field :ready_to_start, type: Boolean, default: false
   field :unable_to_start_dealer, type: Boolean, default: false
   field :dealer_options, type: String, default: (
@@ -343,10 +347,10 @@ class Match
   def finished?() started? && self.slices.last.match_ended? end
   def running?() dealer_running? && proxy_running? end
   def dealer_running?
-    self.dealer_pid >= 0 && AcpcDealer::process_exists?(self.dealer_pid)
+    self.dealer_pid && self.dealer_pid > 0 && AcpcDealer::process_exists?(self.dealer_pid)
   end
   def proxy_running?
-    self.proxy_pid >= 0 && AcpcDealer::process_exists?(self.proxy_pid)
+    self.proxy_pid && self.proxy_pid > 0 && AcpcDealer::process_exists?(self.proxy_pid)
   end
   def all_slices_viewed?
     self.last_slice_viewed >= (self.slices.length - 1)

data/lib/acpc_table_manager/version.rb

@@ -1,3 +1,3 @@
 module AcpcTableManager
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acpc_table_manager
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Dustin Morrill