zold 0.16.19 → 0.16.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5c735ab0c917e4b346f598206c82a224a81caf5e6e3629d73203cb918bd6200
-  data.tar.gz: 41f2241f736aab555d0fd2a32481814c2142121339488a7e6269506a398204d2
+  metadata.gz: fecaea03a1281af059406fd284d9b814fac0e4d0646ef6e65d8b4aacbf813169
+  data.tar.gz: 5e9a58d162b1333189e6346a25e2d24c411ec4bf3a3f074ab2c0a3d3e1185a57
 SHA512:
-  metadata.gz: 8b477ea12a0c08aff12a68c5f07af44e13ebd131c0c156b9cde6fcf62da81fe21ffab32c3dc13483ec330a0f8a01ad8efcb67bc8612b772ea812bff5fe5b2a8a
-  data.tar.gz: 2eed2bff0ee50b4136088e2ad3a8b7c1ca80cffe02115f25891eeb6d45129bc590387134afbe22ed3bce1bf8c944c507aff07aa4708d5e7395b5b90998c2d045
+  metadata.gz: 9a71a411222753fc52f30ae2e4c9f7e374832840430cedfde87f5572ee7f1a67f41365bc17ac8fb708feaeb77ac8ad9e4c8c7137f61568d0734ba845f1561a47
+  data.tar.gz: aad4fc840d9e5c87315f6a4d1c4997e326511eb94910c1aec9496b89e37ea7c7926b0ae55d69f31bc069d374a946eebf12c395060b168a992d2f9c03ddb5a809

data/lib/zold/node/farmers.rb

@@ -24,6 +24,7 @@ require 'open3'
 require 'backtrace'
 require 'zold/score'
 require 'shellwords'
+require 'posix/spawn'
 require_relative '../log'
 require_relative '../age'
 
@@ -48,6 +49,9 @@ module Zold
       end
 
       def up(score)
+        if POSIX::Spawn::Child.new('ps', 'ax').out.include?(score.to_s.split(' ').take(4).join(' '))
+          raise "We are farming the score already: #{score}"
+        end
         start = Time.now
         bin = File.expand_path(File.join(File.dirname(__FILE__), '../../../bin/zold'))
         raise "Zold binary not found at #{bin}" unless File.exist?(bin)
@@ -64,6 +68,7 @@ module Zold
         ].join(' ')
         Open3.popen2e(cmd) do |stdin, stdout, thr|
           Thread.current.thread_variable_set(:pid, thr.pid.to_s)
+          at_exit { kill(thr.pid, start) }
           @log.debug("Scoring started in proc ##{thr.pid} \
 for #{score.value}/#{score.strength} at #{score.host}:#{score.port}")
           begin
@@ -93,16 +98,16 @@ for #{score.value}/#{score.strength} at #{score.host}:#{score.port}")
 for #{after.host}:#{after.port} in #{Age.new(start)}: #{after.suffixes}")
             after
           ensure
-            kill(thr.pid)
+            kill(thr.pid, start)
           end
         end
       end
 
       private
 
-      def kill(pid)
+      def kill(pid, start)
         Process.kill('KILL', pid)
-        @log.debug("Process ##{pid} killed")
+        @log.debug("Process ##{pid} killed after #{Age.new(start)} of activity")
       rescue StandardError => e
         @log.debug("No need to kill process ##{pid} since it's dead already: #{e.message}")
       end

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.16.19'
+  VERSION = '0.16.20'
   PROTOCOL = 2
 end

data/test/node/test_farmers.rb

@@ -58,4 +58,21 @@ class FarmersTest < Zold::Test
     assert_equal('some-host', after.host)
     assert_equal(9999, after.port)
   end
+
+  def test_avoid_duplicate_processes
+    log = TestLogger.new(test_log)
+    time = Time.now
+    thread = Thread.start do
+      farmer = Zold::Farmers::Spawn.new(log: log)
+      farmer.up(Zold::Score.new(time: time, host: 'a', port: 1, invoice: 'prefixone@ffffffffffffffff', strength: 20))
+    end
+    assert_wait { !log.msgs.find { |m| m.include?('Scoring started') }.nil? }
+    assert_raises do
+      Zold::Farmers::Spawn.new(log: log).up(
+        Zold::Score.new(time: time, host: 'a', port: 1, invoice: 'prefixtwo@ffffffffffffffff', strength: 20)
+      )
+    end
+    thread.kill
+    thread.join
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.19
+  version: 0.16.20
 platform: ruby
 authors:
 - Yegor Bugayenko