zold 0.17.9 → 0.17.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4567d45897491fe4282ba9fffc25102944150b1aeaa78faa404a559daeca9361
-  data.tar.gz: 4c7ca7524761770cd82f7c21532965a5257240e2733d9bc9ea91bf6a88fcf1af
+  metadata.gz: 80212bbebddbc1807018d0ddaf9ce6af4e902b446840efa3976f2bf8aaf70e7f
+  data.tar.gz: 962892885f128f4841e36f7c75146ab695832e4a499822acf46fc07e5799934d
 SHA512:
-  metadata.gz: d3d437b8b7131358a521be3e0ee49b1f0a81a0bb1c995686cbc22372670f581cc1d4f455b03a445c2ea0a65eb79b33c5706e8d2b3b8abfff197201c4af531cd4
-  data.tar.gz: 13a80d37be609c96b5522d937848f900eb51a904a2059c4a00315e791948d0fdd421077dd9399644f316ac84e9fb12b99a5f4932887a091c008fc05af5921f9d
+  metadata.gz: bf58960e766640f2acf4e6d1665dcbb896ac8590994147e0e8a3819d753633d4d6fe8d126d11637a4c8e5ef702c061b0e21202c411fa5c4f7b2b59f26cfff38c
+  data.tar.gz: 300f10b27f536f837526f9d8464990fad14757152eb925096d863fed6e7f50a8c9b7005b3dfd6cd40926116611869f0849bac78ef54361d292a8326e955f27d7

data/lib/zold/commands/node.rb

@@ -130,6 +130,9 @@ module Zold
         o.bool '--skip-oom',
           'Skip Out Of Memory check and never exit, no matter how much RAM is consumed',
           default: false
+        o.integer '--oom-limit',
+          'Maximum amount of memory we can consume, quit if we take more than that, in Mb (default: 512)',
+          default: 512
         o.integer '--queue-limit',
           'The maximum number of wallets to be accepted via PUSH and stored in the queue (default: 4096)',
           default: 4096
@@ -228,7 +231,7 @@ module Zold
           wallets: @wallets, remotes: @remotes, copies: @copies, log: @log
         ).run(['invoice', invoice, "--network=#{opts['network']}"])
       end
-      SafeEntrance.new(
+      entrance = SafeEntrance.new(
         NoSpamEntrance.new(
           NoDupEntrance.new(
             AsyncEntrance.new(
@@ -257,12 +260,13 @@ module Zold
           log: @log
         ),
         network: opts['network']
-      ).start do |entrance|
-        Front.set(:entrance, entrance)
-        Farm.new(invoice, File.join(home, 'farm'), log: @log, farmer: farmer(opts), strength: opts[:strength])
-          .start(host, opts[:port], threads: opts[:threads]) do |farm|
-          Front.set(:farm, farm)
-          metronome(farm, opts).start do |metronome|
+      )
+      entrance.start do |ent|
+        Front.set(:entrance, ent)
+        farm = Farm.new(invoice, File.join(home, 'farm'), log: @log, farmer: farmer(opts), strength: opts[:strength])
+        farm.start(host, opts[:port], threads: opts[:threads]) do |f|
+          Front.set(:farm, f)
+          metronome(f, opts).start do |metronome|
             Front.set(:metronome, metronome)
             @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
             Front.run!

data/lib/zold/commands/propagate.rb

@@ -84,7 +84,7 @@ Available options:"
           end
           next if target.includes_positive?(t.id, id)
           unless target.prefix?(t.prefix)
-            @log.error("#{t.amount * -1} to #{t.bnf}: wrong prefix")
+            @log.error("#{t.amount * -1} from #{id} to #{t.bnf}: wrong prefix \"#{t.prefix}\" in \"#{t}\"")
             next
           end
           target.add(t.inverse(id))

data/lib/zold/commands/remote.rb

@@ -187,7 +187,7 @@ Available options:"
 
     def add(host, port, opts)
       if opts['ignore-node'].include?("#{host}:#{port}")
-        @log.info("#{host}:#{port} won't be added since it's in the --ignore-node list")
+        @log.debug("#{host}:#{port} won't be added since it's in the --ignore-node list")
         return
       end
       if opts['ignore-if-exists'] && @remotes.exists?(host, port)
@@ -286,7 +286,8 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
       if total.zero?
         @log.info("The list of remotes is #{Rainbow('empty').red}, run 'zold remote reset'!")
       else
-        @log.info("There are #{total} known remotes after update in #{Age.new(st)}")
+        @log.info("There are #{total} known remotes with the overall score of \
+#{@remotes.all.map { |r| r[:score] }.inject(&:+)}, after update in #{Age.new(st)}")
       end
     end
 

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

@@ -52,7 +52,7 @@ module Zold
         cmd.run(args + ['trim'])
         cmd.run(args + ['select'])
         @log.info("Reconnected, there are #{@remotes.all.count} remote notes: \
-#{@remotes.all.map { |r| "#{r[:host]}:#{r[:port]}" }.join(', ')}")
+#{@remotes.all.map { |r| "#{r[:host]}:#{r[:port]}/#{r[:score]}/#{r[:errors]}" }.join(', ')}")
       end
     end
   end

data/lib/zold/dir_items.rb

@@ -39,7 +39,7 @@ module Zold
     end
 
     def fetch(recursive: true)
-      `find #{([@dir, '-type', 'f', '-print'] + (recursive ? [] : ['-maxdepth', '1'])).join(' ')}`
+      `find #{([@dir] + (recursive ? [] : ['-maxdepth', '1']) + ['-type', 'f', '-print']).join(' ')}`
         .strip
         .split(' ')
         .select { |f| f.start_with?(@dir) && f.length > @dir.length }

data/lib/zold/metronome.rb

@@ -62,17 +62,16 @@ module Zold
     end
 
     def start
-      alive = true
       @routines.each_with_index do |r, idx|
         @threads << Thread.start do
           Thread.current.abort_on_exception = true
           Thread.current.name = "#{r.class.name}-#{idx}"
           step = 0
-          while alive
+          loop do
             @starts[Thread.current] = Time.now
             begin
               r.exec(step)
-              @log.info("Routine #{r.class.name} ##{step} done in #{Age.new(@starts[Thread.current])}")
+              @log.debug("Routine #{r.class.name} ##{step} done in #{Age.new(@starts[Thread.current])}")
             rescue StandardError => e
               @failures[r.class.name] = Time.now.utc.iso8601 + "\n" + Backtrace.new(e).to_s
               @log.error("Routine #{r.class.name} ##{step} failed in #{Age.new(@starts[Thread.current])}")
@@ -88,16 +87,10 @@ module Zold
       ensure
         start = Time.now
         unless @threads.empty?
-          alive = false
           @log.info("Stopping the metronome with #{@threads.count} threads: #{@threads.map(&:name).join(', ')}")
           @threads.each do |t|
-            tstart = Time.now
-            if t.join(60)
-              @log.info("Thread #{t.name} finished in #{Age.new(tstart)}")
-            else
-              t.exit
-              @log.info("Thread #{t.name} killed in #{Age.new(tstart)}")
-            end
+            t.kill
+            t.join
           end
         end
         @log.info("Metronome stopped in #{Age.new(start)}, #{@failures.count} failures")

data/lib/zold/node/front.rb

@@ -23,6 +23,7 @@
 STDOUT.sync = true
 
 require 'eventmachine'
+require 'get_process_mem'
 require 'thin'
 require 'json'
 require 'sinatra/base'
@@ -135,8 +136,8 @@ while #{settings.address} is in '#{settings.opts['network']}'")
       headers['X-Zold-Thread'] = Thread.current.object_id.to_s
       unless @start.nil?
         if Time.now - @start > 1
-          settings.log.info("Slow response to #{request.request_method} #{request.url} \
-in #{Age.new(@start, limit: 1)}")
+          settings.log.info("Slow response to #{request.request_method} #{request.url}
+from #{request.ip} in #{Age.new(@start, limit: 1)}")
         end
         headers['X-Zold-Milliseconds'] = ((Time.now - @start) * 1000).round.to_s
       end
@@ -204,9 +205,8 @@ in #{Age.new(@start, limit: 1)}")
           Concurrent.processor_count
         end,
         memory: settings.zache.get(:memory, lifetime: 5 * 60) do
-          require 'get_process_mem'
           mem = GetProcessMem.new.bytes.to_i
-          if mem > 1024 * 1024 * 1024 && !settings.opts['skip-oom']
+          if mem > settings.opts['oom-limit'] * 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
@@ -429,6 +429,11 @@ in #{Age.new(@start, limit: 1)}")
       content_type 'text/plain'
       headers['X-Zold-Error'] = e.message
       settings.log.error(Backtrace.new(e).to_s) unless e.is_a?(SoftError)
+      if e.is_a?(Errno::ENOMEM) && !settings.opts['skip-oom']
+        settings.log.error("We are running out of memory (#{Size.new(GetProcessMem.new.bytes.to_i)}), \
+time to stop; use --skip-oom to never quit")
+        Front.stop!
+      end
       Backtrace.new(e).to_s
     end
 

data/lib/zold/node/safe_entrance.rb

@@ -23,6 +23,7 @@
 require 'concurrent'
 require 'tempfile'
 require_relative 'emission'
+require_relative 'soft_error'
 require_relative '../log'
 require_relative '../remotes'
 require_relative '../copies'
@@ -64,19 +65,19 @@ module Zold
         wallet = Wallet.new(f.path)
         wallet.refurbish
         unless wallet.protocol == Zold::PROTOCOL
-          raise "Protocol mismatch, #{wallet.id} is in '#{wallet.protocol}', we are in '#{Zold::PROTOCOL}'"
+          raise SoftError, "Protocol mismatch, #{wallet.id} is in '#{wallet.protocol}', we are in '#{Zold::PROTOCOL}'"
         end
         unless wallet.network == @network
-          raise "Network name mismatch, #{wallet.id} is in '#{wallet.network}', we are in '#{@network}'"
+          raise SoftError, "Network name mismatch, #{wallet.id} is in '#{wallet.network}', we are in '#{@network}'"
         end
         balance = wallet.balance
         if balance.negative? && !wallet.root?
-          raise "The balance #{balance} of #{wallet.id} is negative and it's not a root wallet"
+          raise SoftError, "The balance #{balance} of #{wallet.id} is negative and it's not a root wallet"
         end
         Emission.new(wallet).check
         tax = Tax.new(wallet)
         if tax.in_debt?
-          raise "Taxes are not paid, can't accept the wallet #{wallet.mnemo}; the debt is #{tax.debt} \
+          raise SoftError, "Taxes are not paid, can't accept the wallet #{wallet.mnemo}; the debt is #{tax.debt} \
 (#{tax.debt.to_i} zents); formula ingredients are #{tax.to_text}"
         end
         @entrance.push(id, body)

data/lib/zold/node/spread_entrance.rb

@@ -66,7 +66,9 @@ module Zold
           Endless.new('push', log: @log).run do
             id = @modified.pop
             if @remotes.all.empty?
-              @log.info("There are no remotes, won\'t spread #{id}")
+              @log.info("There are no remotes, won't spread #{id}")
+            elsif @wallets.acq(id) { |w| Tax.new(w).in_debt? }
+              @log.info("The wallet #{id} is in debt, won't spread")
             else
               Thread.current.thread_variable_set(:wallet, id.to_s)
               Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
@@ -82,7 +84,8 @@ module Zold
         ensure
           @log.info('Waiting for spread entrance to finish...')
           @modified.clear
-          @push.exit
+          @push.kill
+          @push.join
           @log.info('Spread entrance finished, thread killed')
         end
       end

data/lib/zold/version.rb

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

data/test/node/test_front.rb

@@ -284,14 +284,13 @@ class FrontTest < Zold::Test
   # out those that are too weak.
   def test_score_is_reduced
     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(max: 60) do
-        Zold::Score.parse(res.headers[Zold::Http::SCORE_HEADER]).value > Zold::Front::MIN_SCORE - 1
-      end
-      sleep(3)
-      assert_equal_wait(Zold::Front::MIN_SCORE, max: 60) do
-        Zold::Score.parse(res.headers[Zold::Http::SCORE_HEADER]).value
+      scores = []
+      50.times do
+        res = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
+        scores << Zold::Score.parse(res.headers[Zold::Http::SCORE_HEADER]).value
+        sleep(0.1)
       end
+      assert(scores.uniq.sort.reverse[0] <= Zold::Front::MIN_SCORE)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.17.9
+  version: 0.17.10
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -700,7 +700,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.17.9!
+  Thanks for installing Zold 0.17.10!
     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