zold 0.13.31 → 0.13.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c98b1e9d02790f3993431a547adc638b53e7388e
-  data.tar.gz: fda7df22416b00eebc03f9bcefaed0aa847c8a7a
+  metadata.gz: efe52b4e0be9a85e1a66d18a637d4495c6fd7409
+  data.tar.gz: e698b73bda8784b6eb40d3ca9d50b175050938da
 SHA512:
-  metadata.gz: ff4a715122869803cef3bf0045badbf837d9e64a550dcd2b3f0690dad7ea30b31824f923cc53e2bd1c2ae3b38ece51b3a1e5a80ba8dae8bde7ade0c3af98a3b9
-  data.tar.gz: 88c77327f5eeaf7a909c69bb5c85b9d10571491bf5503b1bf6d931bd8eafd336f2518d3320be404c1d4835dac2d71ef6731f94547cd1f3ac99eaa04505209dc8
+  metadata.gz: a1d4c2a547c39e6647cc44021edc81ade879816a09768f730823b143a287dec9b5fe69c6cdc34567d2afe8daa34975f0194d7511cde5ffb6b3f630d5071aa110
+  data.tar.gz: e87c42f314772d1b789cedfc629e0551a41c7e980a8804c9403c9e37256870f8b73fc347845edd184af80e59379fcfd01a5378d94d36ca2e14b173d79add425f

data/lib/zold/commands/remote.rb

@@ -132,7 +132,7 @@ Available options:"
         @remotes.add(host, port)
         @log.info("#{host}:#{port} added to the list, #{@remotes.all.count} total")
       end
-      @log.info("There are #{@remotes.all.count} remote nodes in the list")
+      @log.debug("There are #{@remotes.all.count} remote nodes in the list")
     end
 
     def remove(host, port, opts)
@@ -143,7 +143,7 @@ Available options:"
         raise "#{host}:#{port} is not in the list" unless opts['force']
         @log.debug("#{host}:#{port} is not in the list")
       end
-      @log.info("There are #{@remotes.all.count} remote nodes in the list")
+      @log.debug("There are #{@remotes.all.count} remote nodes in the list")
     end
 
     # Returns an array of Zold::Score
@@ -202,7 +202,8 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
           end
         end
         capacity << { host: score.host, port: score.port, count: json['all'].count }
-        @log.info("#{r}: #{Rainbow(score.value).green} (#{json['version']}) in #{(Time.now - start).round(2)}s")
+        @log.info("#{r}: the score is #{Rainbow(score.value).green} (#{json['version']}) \
+in #{(Time.now - start).round(2)}s")
       end
       max_capacity = capacity.map { |c| c[:count] }.max || 0
       capacity.each do |c|

data/lib/zold/http.rb

@@ -52,6 +52,7 @@ module Zold
     def get
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.read_timeout = 5
+      http.open_timeout = 5
       path = @uri.path
       path += '?' + @uri.query if @uri.query
       http.request_get(path, headers)
@@ -61,6 +62,7 @@ module Zold
 
     def put(body)
       http = Net::HTTP.new(@uri.host, @uri.port)
+      http.open_timeout = 5
       http.read_timeout = 10
       path = @uri.path
       path += '?' + @uri.query if @uri.query

data/lib/zold/metronome.rb

@@ -43,7 +43,8 @@ module Zold
             routine.exec(step)
           end
           step += 1
-          @log.info("Routine #{routine.class.name} ##{step} done in #{(Time.now - start).round(2)}s")
+          @log.info("Routine #{routine.class.name} ##{step} done in #{(Time.now - start).round(2)}s: \
+#{@threads.map { |t| "#{t.name}/#{t.status}" }.join(',')}")
           sleep(1)
         end
       end

data/lib/zold/patch.rb

@@ -67,15 +67,15 @@ module Zold
             next
           end
           if !@txns.empty? && @txns.map(&:amount).inject(&:+) < txn.amount
-            @log.debug("Transaction ##{txn.id} attempts to make the balance negative: #{txn.to_text}")
+            @log.error("Transaction ##{txn.id} attempts to make the balance negative: #{txn.to_text}")
             next
           end
           unless Signature.new.valid?(@key, wallet.id, txn)
-            @log.debug("Invalid RSA signature at transaction ##{txn.id} of #{wallet.id}: #{txn.to_text}")
+            @log.error("Invalid RSA signature at transaction ##{txn.id} of #{wallet.id}: #{txn.to_text}")
             next
           end
         elsif !txn.sign.nil? && !txn.sign.empty?
-          @log.debug("RSA signature is redundant at ##{txn.id} of #{wallet.id}: #{txn.to_text}")
+          @log.error("RSA signature is redundant at ##{txn.id} of #{wallet.id}: #{txn.to_text}")
           next
         end
         @log.debug("Merged on top: #{txn.to_text}")

data/lib/zold/remotes.rb

@@ -36,7 +36,7 @@ module Zold
     PORT = 4096
 
     # At what amount of errors we delete the remote automatically
-    TOLERANCE = 20
+    TOLERANCE = 8
 
     # Empty, for standalone mode
     class Empty
@@ -52,12 +52,14 @@ module Zold
     # One remote.
     class Remote
       attr_reader :host, :port
-      def initialize(host, port, score, log: Log::Quiet.new)
+      def initialize(host, port, score, idx, log: Log::Quiet.new)
         @host = host
         raise 'Post must be Integer' unless port.is_a?(Integer)
         @port = port
         raise 'Score must be of type Score' unless score.is_a?(Score)
         @score = score
+        raise 'Idx must be of type Integer' unless idx.is_a?(Integer)
+        @idx = idx
         @log = log
       end
 
@@ -66,7 +68,7 @@ module Zold
       end
 
       def to_s
-        "#{@host}:#{@port}"
+        "#{@host}:#{@port}/#{@idx}"
       end
 
       def assert_code(code, response)
@@ -161,9 +163,11 @@ module Zold
       best = farm.best[0]
       require_relative 'score'
       score = best.nil? ? Score::ZERO : best
+      idx = 0
       all.each do |r|
         begin
-          yield Remotes::Remote.new(r[:host], r[:port], score, log: log)
+          yield Remotes::Remote.new(r[:host], r[:port], score, idx, log: log)
+          idx += 1
         rescue StandardError => e
           error(r[:host], r[:port])
           errors = errors(r[:host], r[:port])

data/lib/zold/version.rb

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

metadata

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