zold 0.17.7 → 0.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe6c89e0f94aab5d15fc27cbd8cd8b25ae870341eb056e442a568430c97b1fa
-  data.tar.gz: 55b3c18e4f6c223c521265b4ae1c7cb9c46b5e915df6dbe47f3c176ec0ad00d0
+  metadata.gz: b6e1c255573260dfc82b50fec8a41ae005471dbaec11a736983de5a609e41630
+  data.tar.gz: 99af27923788d3878f924d6f3b265e9a2d37ee49ca37b44ef30421901c73658b
 SHA512:
-  metadata.gz: 66998849bf25873d1814fee29109744bffddc9c19f39c179388a605b55f6414ec6bb9df72455c3e83439c85475268d752731cf74f574c5aab6e1fdf3505d0aa3
-  data.tar.gz: ecd1a71750d26762749ab24c931307713f7b8586ba09d865e324b209d441d3740ddb65df97c59d3409b19b88e22c6a8698881ccbe7d203c2ac9e91563f262edb
+  metadata.gz: e724f19149afaeeb61a4053052da0288339c8ea23235de66ed66baa5ad15c0b80fe912081f26096ba30101dc9e650c47257b1157c29ca9d751d137efcd3a5516
+  data.tar.gz: 72055148011cc61cf7a2828c0b0315127146f4ce22738ba7f956084ba658ad103a8f2df3e6d4ff7a9d8e8ce6318dba4e71d7b6451bdd98738965d3a84a9864bb

data/lib/zold/commands/remote.rb

@@ -102,6 +102,9 @@ Available options:"
         o.bool '--skip-ping',
           'Don\'t ping back the node when adding it (not recommended)',
           default: false
+        o.bool '--ignore-ping',
+          'Don\'t fail if ping fails, just report the problem in the log',
+          default: false
         o.integer '--depth',
           'The amount of update cycles to run, in order to fetch as many nodes as possible (default: 2)',
           default: 2
@@ -191,12 +194,13 @@ Available options:"
         @log.debug("#{host}:#{port} already exists, won't add because of --ignore-if-exists")
         return
       end
-      unless opts['skip-ping']
-        res = Http.new(uri: "http://#{host}:#{port}/version", network: opts['network']).get
-        raise "The node #{host}:#{port} is not responding, #{res.status}:#{res.status_line}" unless res.status == 200
+      return unless ping(host, port, opts)
+      if @remotes.exists?(host, port)
+        @log.info("#{host}:#{port} already exists among #{@remotes.all.count} others")
+      else
+        @remotes.add(host, port)
+        @log.info("#{host}:#{port} added to the list, #{@remotes.all.count} total")
       end
-      @remotes.add(host, port)
-      @log.info("#{host}:#{port} added to the list, #{@remotes.all.count} total")
     end
 
     def remove(host, port, _)
@@ -258,22 +262,16 @@ Available options:"
              Semantic::Version.new(VERSION) < Semantic::Version.new(gem.last_version)
             if opts['reboot']
               @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
-  (use --never-reboot to avoid this from happening)")
+(use --never-reboot to avoid this from happening)")
               terminate
             end
             @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")
+it's recommended to reboot, but I don't do it because of --never-reboot")
           end
           if cycle.positive?
             json['all'].each do |s|
-              if opts['ignore-node'].include?("#{s['host']}:#{s['port']}")
-                @log.debug("#{s['host']}:#{s['port']}, which is found at #{r} \
-  won't be added since it's in the --ignore-node list")
-                next
-              end
               next if @remotes.exists?(s['host'], s['port'])
-              @remotes.add(s['host'], s['port'])
-              @log.info("#{s['host']}:#{s['port']} found at #{r} and added to the list of #{@remotes.all.count}")
+              add(s['host'], s['port'], opts)
             end
           end
           capacity << { host: score.host, port: score.port, count: json['all'].count }
@@ -304,5 +302,14 @@ Available options:"
       require_relative '../node/front'
       Front.stop!
     end
+
+    def ping(host, port, opts)
+      return true if opts['skip-ping']
+      res = Http.new(uri: "http://#{host}:#{port}/version", network: opts['network']).get
+      return true if res.status == 200
+      raise "The node #{host}:#{port} is not responding, #{res.status}:#{res.status_line}" unless opts['ignore-ping']
+      @log.error("The node #{host}:#{port} is not responding, #{res.status}:#{res.status_line}")
+      false
+    end
   end
 end

data/lib/zold/commands/routines/reconnect.rb

@@ -43,7 +43,7 @@ module Zold
       def exec(_ = 0)
         sleep(60) unless @opts['routine-immediately']
         cmd = Remote.new(remotes: @remotes, log: @log, farm: @farm)
-        args = ['remote', "--network=#{@opts['network']}"]
+        args = ['remote', "--network=#{@opts['network']}", '--ignore-ping']
         score = @farm.best[0]
         args << "--ignore-node=#{score.host}:#{score.port}" if score
         cmd.run(args + ['defaults']) unless @opts['routine-immediately']

data/lib/zold/node/farm.rb

@@ -99,7 +99,8 @@ module Zold
           "#{t.name}/#{t.status}/#{t.alive? ? 'alive' : 'dead'}"
         end.join(', '),
         pipeline: @pipeline.size,
-        best: best.map(&:to_mnemo).join(', ')
+        best: best.map(&:to_mnemo).join(', '),
+        farmer: @farmer.class.name
       }
     end
 

data/lib/zold/node/front.rb

@@ -206,7 +206,7 @@ in #{Age.new(@start, limit: 1)}")
         memory: settings.zache.get(:memory, lifetime: 5 * 60) do
           require 'get_process_mem'
           mem = GetProcessMem.new.bytes.to_i
-          if mem > 256 * 1024 * 1024 && !settings.opts['skip-oom']
+          if mem > 1024 * 1024 * 1024 && !settings.opts['skip-oom']
             settings.log.error("We are too big in memory (#{Size.new(mem)}), quitting; use --skip-oom to never quit")
             Front.stop!
           end

data/lib/zold/version.rb

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

data/test/node/test_front.rb

@@ -286,8 +286,8 @@ class FrontTest < Zold::Test
     FakeNode.new(log: test_log).run(['--threads=1', '--strength=1', '--no-metronome', '--farmer=plain']) do |port|
       res = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
       assert_wait { Zold::Score.parse(res.headers[Zold::Http::SCORE_HEADER]).value > Zold::Front::MIN_SCORE - 1 }
-      sleep(1)
-      assert_equal_wait(Zold::Front::MIN_SCORE) do
+      sleep(3)
+      assert_equal_wait(Zold::Front::MIN_SCORE, max: 60) do
         Zold::Score.parse(res.headers[Zold::Http::SCORE_HEADER]).value
       end
     end
@@ -311,18 +311,13 @@ class FrontTest < Zold::Test
   def test_alias_parameter
     name = SecureRandom.hex(4)
     FakeNode.new(log: test_log).run(['--ignore-score-weakness', "--alias=#{name}"]) do |port|
-      [
-        '/',
-        '/remotes'
-      ].each do |path|
-        uri = URI("http://localhost:#{port}#{path}")
-        response = Zold::Http.new(uri: uri).get
-        assert_match(
-          name,
-          Zold::JsonPage.new(response.body).to_hash['alias'].to_s,
-          response.body
-        )
-      end
+      uri = URI("http://localhost:#{port}/")
+      response = Zold::Http.new(uri: uri).get
+      assert_match(
+        name,
+        Zold::JsonPage.new(response.body).to_hash['alias'].to_s,
+        response.body
+      )
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.17.7
+  version: 0.17.8
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -700,7 +700,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.17.7!
+  Thanks for installing Zold 0.17.8!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io