zold 0.11.7 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b394868e7a954a6a72411f2326339ca57cd6c2
-  data.tar.gz: e39cfab10878262a6431c4bd2bd5a06a3939a973
+  metadata.gz: 73c4792176a13df605a885ea46e4cb92b0df76c6
+  data.tar.gz: 6ca3f32b2975db9dcf533aeb746e80e775224427
 SHA512:
-  metadata.gz: b414866acdc3a4a099e293c5ec6358d9ad0ffbd223306469e38477736430818d84b5bc7eda44e120f69af5c9aa202e5ebae1989a8b5257f7e8a7ff8e5e701977
-  data.tar.gz: 6edc6beb6b837bf7f9151cb3f9e652bd737c2c8362d558d0c039a6edc6806f2344bec791bda91fb3544966bd78a8508ebcd0fe7e31b85feccfaabcd2a4633097
+  metadata.gz: 6982d8437738d658d3d530c69525a501cc409237d2ae42c8affe8edc046636e83e06ae1cb51d0fbe8cefa0da9ae30e1a2da43a72c19037b721c631cb765fee73
+  data.tar.gz: 14a0e10962910847fea075ea48b26063e2baac9ed91e1b46453cee53764ebbc641b773bb0de5d8aeb854881852941bad46a15e208e379b5f266017da98d8ce33

data/lib/zold/commands/diff.rb

@@ -26,6 +26,7 @@ require_relative 'args'
 require_relative '../log'
 require_relative '../patch'
 require_relative '../wallet'
+require_relative '../atomic_file'
 
 # DIFF command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -69,7 +70,7 @@ Available options:"
       cps[1..-1].each do |c|
         patch.join(Wallet.new(c[:path]))
       end
-      before = File.read(wallet.path)
+      before = AtomicFile.new(wallet.path).read
       after = ''
       Tempfile.open do |f|
         patch.save(f, overwrite: true)

data/lib/zold/commands/node.rb

@@ -98,9 +98,8 @@ module Zold
       Front.set(:copies, copies)
       address = "#{opts[:host]}:#{opts[:port]}".downcase
       Front.set(:address, address)
-      Front.set(
-        :entrance, Entrance.new(wallets, remotes, copies, address, log: @log)
-      )
+      entrance = Entrance.new(wallets, remotes, copies, address, log: @log)
+      Front.set(:entrance, entrance)
       Front.set(:root, Dir.pwd)
       Front.set(:port, opts['bind-port'])
       Front.set(:reboot, !opts['never-reboot'])

data/lib/zold/commands/push.rb

@@ -26,6 +26,7 @@ require_relative 'args'
 require_relative '../log'
 require_relative '../id'
 require_relative '../http'
+require_relative '../atomic_file'
 
 # PUSH command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -77,7 +78,7 @@ Available options:"
         return 0
       end
       start = Time.now
-      content = File.read(wallet.path)
+      content = AtomicFile.new(wallet.path).read
       response = r.http("/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}").put(content)
       if response.code == '304'
         @log.info("#{r}: same version of #{wallet.id} there")

data/lib/zold/commands/remote.rb

@@ -141,7 +141,7 @@ Available options:"
 
     def trim(opts)
       @remotes.all.each do |r|
-        remove(r[:host], r[:port], opts) if r[:errors] > 20
+        remove(r[:host], r[:port], opts) if r[:errors] > Remotes::TOLERANCE
       end
       @log.info("The list of remotes trimmed, #{@remotes.all.count} nodes left there")
     end

data/lib/zold/copies.rb

@@ -66,7 +66,7 @@ module Zold
       list = load
       target = list.find do |s|
         f = File.join(@dir, s[:name])
-        File.exist?(f) && File.read(f) == content
+        File.exist?(f) && AtomicFile.new(f).read == content
       end
       if target.nil?
         max = Dir.new(@dir)

data/lib/zold/key.rb

@@ -22,6 +22,7 @@ gem 'openssl'
 require 'openssl'
 require 'base64'
 require 'tempfile'
+require_relative 'atomic_file'
 
 # The RSA key (either private or public).
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -35,7 +36,7 @@ module Zold
         unless file.nil?
           path = File.expand_path(file)
           raise "Can't find RSA key at #{file} (#{path})" unless File.exist?(path)
-          return File.read(path)
+          return AtomicFile.new(path).read
         end
         unless text.nil?
           return text if text.start_with?('-----')

data/lib/zold/node/entrance.rb

@@ -44,7 +44,29 @@ module Zold
       @address = address
       @log = log
       @semaphores = Concurrent::Map.new
+      @push_mutex = Mutex.new
+      @modified = Set.new
       @pool = Concurrent::FixedThreadPool.new(16, max_queue: 64, fallback_policy: :abort)
+      @pushes = Concurrent::FixedThreadPool.new(1, max_queue: 64, fallback_policy: :abort)
+    end
+
+    def to_json
+      {
+        'semaphores': @semaphores.size,
+        'modified': @modified.length,
+        'pool': {
+          'completed_task_count': @pool.completed_task_count,
+          'largest_length': @pool.largest_length,
+          'length': @pool.length,
+          'queue_length': @pool.queue_length
+        },
+        'pushes': {
+          'completed_task_count': @pushes.completed_task_count,
+          'largest_length': @pushes.largest_length,
+          'length': @pushes.length,
+          'queue_length': @pushes.queue_length
+        }
+      }
     end
 
     def push(id, body, sync: true)
@@ -75,6 +97,9 @@ module Zold
       end
     end
 
+    private
+
+    # Returns a list of modifed wallets (as Zold::Id)
     def push_sync(id, body)
       @semaphores.put_if_absent(id, Mutex.new)
       @semaphores.get(id).synchronize do
@@ -85,6 +110,7 @@ module Zold
       end
     end
 
+    # Returns a list of modifed wallets (as Zold::Id)
     def push_unsafe(id, body)
       copies = Copies.new(File.join(@copies, id.to_s))
       copies.add(body, '0.0.0.0', Remotes::PORT, 0)
@@ -96,10 +122,19 @@ module Zold
       ).run(['merge', id.to_s])
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove('remote', Remotes::PORT)
-      Push.new(
-        wallets: @wallets, remotes: @remotes, log: @log
-      ).run(['push', "--ignore-node=#{@address}"] + modified.map(&:to_s))
+      @push_mutex.synchronize { @modified += modified }
+      @pushes.post { push_one } if @pushes.length < 2
       modified
     end
+
+    def push_one
+      @push_mutex.synchronize do
+        id = @modified.to_a[0]
+        return if id.nil?
+        Push.new(
+          wallets: @wallets, remotes: @remotes, log: @log
+        ).run(['push', "--ignore-node=#{@address}"] + [id.to_s])
+      end
+    end
   end
 end

data/lib/zold/node/farm.rb

@@ -111,7 +111,8 @@ module Zold
 
     def history(max = 16)
       if File.exist?(@cache)
-        File.readlines(@cache)
+        AtomicFile.new(@cache).read
+          .split(/\n/)
           .map { |t| Score.parse(t) }
           .reject(&:expired?)
           .sort_by(&:value)

data/lib/zold/node/front.rb

@@ -29,6 +29,7 @@ require_relative '../wallet'
 require_relative '../log'
 require_relative '../id'
 require_relative '../http'
+require_relative '../atomic_file'
 
 # The web front of the node.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -40,7 +41,7 @@ module Zold
     configure do
       set :bind, '0.0.0.0'
       set :suppress_messages, true
-      set :dump_errors, true
+      set :dump_errors, false
       set :start, Time.now
       set :lock, false
       set :show_exceptions, false
@@ -123,6 +124,7 @@ module Zold
         wallets: settings.wallets.all.count,
         remotes: settings.remotes.all.count,
         farm: settings.farm.to_json,
+        entrance: settings.entrance.to_json,
         date: `date  --iso-8601=seconds -u`.strip,
         hours_alive: ((Time.now - settings.start) / (60 * 60)).round(2),
         home: 'https://www.zold.io'
@@ -137,7 +139,7 @@ module Zold
       {
         version: VERSION,
         score: score.to_h,
-        body: File.read(wallet.path)
+        body: AtomicFile.new(wallet.path).read
       }.to_json
     end
 
@@ -146,7 +148,7 @@ module Zold
       wallet = settings.wallets.find(id)
       request.body.rewind
       body = request.body.read
-      if wallet.exists? && File.read(wallet.path) == body
+      if wallet.exists? && AtomicFile.new(wallet.path).read == body
         status 304
         return
       end

data/lib/zold/patch.rb

@@ -20,6 +20,7 @@
 
 require_relative 'wallet'
 require_relative 'signature'
+require_relative 'atomic_file'
 
 # Patch.
 #
@@ -54,11 +55,11 @@ module Zold
     # Returns TRUE if the file was actually modified
     def save(file, overwrite: false)
       before = ''
-      before = File.read(file) if File.exist?(file)
+      before = AtomicFile.new(file).read if File.exist?(file)
       wallet = Wallet.new(file)
       wallet.init(@id, @key, overwrite: overwrite, network: @network)
       @txns.each { |t| wallet.add(t) }
-      after = File.read(file)
+      after = AtomicFile.new(file).read
       before != after
     end
   end

data/lib/zold/remotes.rb

@@ -34,6 +34,9 @@ module Zold
     # The default TCP port all nodes are supposed to use.
     PORT = 4096
 
+    # At what amount of errors we delete the remote automatically
+    TOLERANCE = 50
+
     # Empty, for standalone mode
     class Empty
       def all
@@ -138,12 +141,21 @@ module Zold
           yield Remotes::Remote.new(r[:host], r[:port], score, log: log)
         rescue StandardError => e
           error(r[:host], r[:port])
-          log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message}")
+          errors = errors(r[:host], r[:port])
+          log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message}; errors=#{errors}")
           log.debug(e.backtrace[0..5].join("\n\t"))
+          remove(r[:host], r[:port]) if errors > Remotes::TOLERANCE
         end
       end
     end
 
+    def errors(host, port = Remotes::PORT)
+      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      list = load
+      raise "#{host}:#{port} is absent among #{list.count} remotes" unless exists?(host, port)
+      list.find { |r| r[:host] == host.downcase && r[:port] == port }[:errors]
+    end
+
     def error(host, port = Remotes::PORT)
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       list = load

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -161,7 +161,7 @@ module Zold
 
     def lines
       raise "File '#{@file}' is absent" unless File.exist?(@file)
-      File.readlines(@file)
+      AtomicFile.new(@file).read.split(/\n/)
     end
   end
 end

data/test/node/test_entrance.rb

@@ -34,6 +34,14 @@ require_relative '../../lib/zold/commands/pay'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class TestEntrance < Minitest::Test
+  def test_renders_json
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet(Zold::Id.new)
+      entrance = Zold::Entrance.new(home.wallets, home.remotes, home.copies(wallet).root, 'x', log: test_log)
+      assert_equal(0, entrance.to_json[:modified])
+    end
+  end
+
   def test_pushes_wallet
     sid = Zold::Id.new
     tid = Zold::Id.new

metadata

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