zold 0.13.26 → 0.13.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3823b82737ef5e72181701f0393152bc25e6d8f
-  data.tar.gz: f42913694036d6bff27ca7e9ce82f9566bb273ec
+  metadata.gz: b851f65454b53cd8782cbbda1fe0b97c84da6027
+  data.tar.gz: d8fcbfd0bcfc07218581e1c1a7797b9148b5d5c4
 SHA512:
-  metadata.gz: 39bdafc2be6cdbc2ae2e6feb18f609e5a73ef772da2a434e6cbef29c66d285186212452d085e981166f080d21348c713a888da8539ffde14b6cd44213b22b023
-  data.tar.gz: 36b181ff6a81b6d342956e9bea2e20b356266b87fa176491193a7f5b16b5740dd5aab947125dbdd9911eeceea67349279ab0fb9702d3576b3c6e7c7bb87bce1e
+  metadata.gz: 9341ba2d4334516308603ebb35094225d3bf6f0293ae7342f30be7ca8b3e6f09297b9ff5b38bbe332feb6dcc294cace6d180ead94f1aa21429a4fd853e452592
+  data.tar.gz: 6b903ce60324a5e137fe6c3da557166db4ac7c88768d5e7f27246c9a771f87a4d7fb1bc834e06b902ffdce6a081f8b8af1df5204f2ad42f99f9f3e3fa89bb736

data/lib/zold/commands/remote.rb

@@ -193,7 +193,7 @@ Available options:"
 (use --never-reboot to avoid this from happening)")
             terminate
           end
-          @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, \
+          @log.debug("#{r}: their version #{json['version']} is higher than mine #{VERSION}, \
 it's recommended to reboot, but I don't do it because of --never-reboot")
         end
         if deep

data/lib/zold/node/farm.rb

@@ -115,13 +115,9 @@ module Zold
     def cleanup(host, port, strength, threads)
       scores = load
       before = scores.map(&:value).max.to_i
-      if scores.empty? || !threads.zero? && scores.map(&:age).min > 24 * 60 * 60 / threads
-        save([Score.new(Time.now, host, port, @invoice, strength: strength)])
-      else
-        save
-      end
+      save(threads, [Score.new(Time.now, host, port, @invoice, strength: strength)])
       scores = load
-      @pipeline << scores.min_by(&:age) if @pipeline.size.zero?
+      @pipeline << scores.max_by(&:age) if @pipeline.size.zero?
       after = scores.map(&:value).max.to_i
       @log.debug("#{Thread.current.name}: best score is #{scores[0]}") if before != after && !after.zero?
     end
@@ -133,12 +129,13 @@ module Zold
       return unless s.port == port
       return unless s.strength >= strength
       Thread.current.name = s.to_mnemo
-      save([s.next])
+      save(threads, [s.next])
       cleanup(host, port, strength, threads)
     end
 
-    def save(list = [])
+    def save(threads, list = [])
       scores = load + list
+      period = 24 * 60 * 60 / [threads, 1].max
       @mutex.synchronize do
         AtomicFile.new(@cache).write(
           scores.select(&:valid?)
@@ -146,6 +143,7 @@ module Zold
             .sort_by(&:value)
             .reverse
             .uniq(&:time)
+            .uniq { |s| s.age % period }
             .map(&:to_s)
             .uniq
             .join("\n")

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.13.26'.freeze
+  VERSION = '0.13.27'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.13.26
+  version: 0.13.27
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby