zold 0.16.11 → 0.16.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7821595a3b9487ea3138bbee7e70a4f6b960004d7e91a08147f5760a3bd6125c
-  data.tar.gz: 37450f49b0f2d5e47ba9476ac83d14667eac4cf6b5b65fc10dd142fb8584b6ee
+  metadata.gz: b3c8beba4ea2ef38460a7107b2d1bf9d751f4dac69924ad31a8b87a771585349
+  data.tar.gz: a9cb982cbb48c63d6755f91251e95a8a72dc5a3dd68bf810001b8ded5994cdf8
 SHA512:
-  metadata.gz: 3d09fdf2081fb1494a1e06b1b28ba8644b5cf4bf7197a6501811dd1f918ca5c7ac5979d1abc6f3b33fd80043922875a87ffe49f51a96c289ed27a2619aef8a6c
-  data.tar.gz: 53b7bb8a8ded97904c9182f4bcc073b85d22b4b3b1cf1b878111a26c07d5c674880d8890e32bc398a1fb4262471b313d1f6b3ce9b644035d0f65a599b5641a3e
+  metadata.gz: b9d5e6df44283a6d75d49b75c5ecb5abb829059114699b4ddbd2e8629e1f76e306be5a64ce29c2f1fb2bf8f6508e7c21efa158325ee7186833d1689b8613d3c5
+  data.tar.gz: a6cc7024026e66a280af7e6410d9e10a1ea6bda8e7d1663e85630ad5077fa03b42991672cc69e3d7717f2e5244b56d571f56bcb2bd1c3b1e1da86f0161da137f

data/lib/zold/node/farm.rb

@@ -98,8 +98,7 @@ module Zold
         end.join(', '),
         cleanup: @cleanup.status,
         pipeline: @pipeline.size,
-        best: best.map(&:to_mnemo).join(', '),
-        alive: @alive
+        best: best.map(&:to_mnemo).join(', ')
       }
     end
 
@@ -122,7 +121,6 @@ module Zold
         @log.info("#{best.size} scores pre-loaded from #{@cache}, the best is: #{best[0]}")
       end
       cleanup(host, port, strength, threads)
-      @alive = true
       @threads = (1..threads).map do |t|
         Thread.new do
           Thread.current.abort_on_exception = true
@@ -131,7 +129,6 @@ module Zold
             VerboseThread.new(@log).run do
               cycle(host, port, strength, threads)
             end
-            break unless @alive
           end
         end
       end
@@ -139,15 +136,6 @@ module Zold
         Thread.current.abort_on_exception = true
         Thread.current.name = 'cleanup'
         loop do
-          max = 100
-          a = (0..max - 1).take_while do
-            sleep 0.01
-            @alive
-          end
-          unless a.count == max
-            @log.info("It's time to stop the cleanup thread (#{a.count} != #{max}, alive=#{@alive})...")
-            break
-          end
           VerboseThread.new(@log).run(true) do
             cleanup(host, port, strength, threads)
           end
@@ -158,33 +146,14 @@ module Zold
       begin
         yield(self)
       ensure
-        @log.info("Terminating the farm with #{@threads.count} threads...")
-        start = Time.now
-        finish(@cleanup)
-        @threads.each { |t| finish(t) }
-        @log.info("Farm stopped in #{Age.new(start)} (threads=#{threads}, strength=#{strength})")
+        @cleanup.kill
+        @threads.each(&:kill)
+        @log.info("Farm stopped (threads=#{threads}, strength=#{strength})")
       end
     end
 
     private
 
-    def finish(thread)
-      start = Time.now
-      @alive = false
-      @log.info("Attempting to terminate the thread \"#{thread.name}\" of the farm...")
-      loop do
-        delay = Time.now - start
-        if thread.join(0.1)
-          @log.info("Thread \"#{thread.name}\" peacefully finished in #{Age.new(start)}")
-          break
-        end
-        if delay > 1
-          thread.exit
-          @log.error("Thread \"#{thread.name}\" forcefully terminated after #{Age.new(start)}")
-        end
-      end
-    end
-
     def cleanup(host, port, strength, threads)
       scores = load
       before = scores.map(&:value).max.to_i
@@ -200,7 +169,6 @@ module Zold
     def cycle(host, port, strength, threads)
       s = []
       loop do
-        return unless @alive
         begin
           s << @pipeline.pop(true)
         rescue ThreadError => _

data/lib/zold/node/farmers.rb

@@ -55,8 +55,8 @@ module Zold
           'ruby',
           Shellwords.escape(bin),
           '--skip-upgrades',
-          Shellwords.escape("--info-thread=#{Thread.current.name}"),
-          Shellwords.escape("--info-start=#{Time.now.utc.iso8601}"),
+          "--info-thread=#{Shellwords.escape(Thread.current.name)}",
+          "--info-start=#{Time.now.utc.iso8601}",
           '--low-priority',
           'next',
           Shellwords.escape(score)
@@ -100,7 +100,7 @@ for #{after.host}:#{after.port} in #{Age.new(start)}: #{after.suffixes}")
       private
 
       def kill(pid)
-        Process.kill('TERM', pid)
+        Process.kill('KILL', pid)
         @log.debug("Process ##{pid} killed")
       rescue StandardError => e
         @log.debug("No need to kill process ##{pid} since it's dead already: #{e.message}")

data/lib/zold/node/front.rb

@@ -189,7 +189,7 @@ in #{Age.new(@start, limit: 1)}")
         cpus: settings.zache.get(:cpus) do
           Concurrent.processor_count
         end,
-        memory: settings.zache.get(:load, lifetime: 5 * 60) do
+        memory: settings.zache.get(:memory, lifetime: 5 * 60) do
           require 'get_process_mem'
           GetProcessMem.new.bytes.to_i
         end,
@@ -405,7 +405,7 @@ in #{Age.new(@start, limit: 1)}")
 
     get '/ps' do
       content_type('text/plain')
-      `ps ax`
+      `ps ax | grep zold`
     end
 
     not_found do

data/lib/zold/version.rb

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

data/test/node/test_farmers.rb

@@ -38,7 +38,7 @@ class FarmersTest < Minitest::Test
   end
 
   def test_calculates_large_score
-    log = TestLogger.new
+    log = TestLogger.new(test_log)
     thread = Thread.start do
       farmer = Zold::Farmers::Spawn.new(log: log)
       farmer.up(Zold::Score.new(host: 'a', port: 1, invoice: 'NOPREFIX4@ffffffffffffffff', strength: 20))

data/test/test__helper.rb

@@ -64,19 +64,23 @@ module Minitest
 
     class TestLogger
       attr_accessor :msgs
-      def initialize
+      def initialize(log = Zold::Log::Quiet.new)
+        @log = log
         @msgs = []
       end
 
       def info(msg)
+        @log.info(msg)
         @msgs << msg
       end
 
       def debug(msg)
+        @log.debug(msg)
         @msgs << msg
       end
 
       def error(msg)
+        @log.error(msg)
         @msgs << msg
       end
     end

metadata

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