zold 0.14.31 → 0.14.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '069e29f108987ab9bdc7277b07493fd5b19ca10d'
-  data.tar.gz: f4bc525e8f801da0f81bc17042e2abadd022d65c
+  metadata.gz: 54bf03ddc21a3ddafab0d79706aafad724b0dd46
+  data.tar.gz: 9640b4e47c225b2599dc79f1ac5e092727d62f9e
 SHA512:
-  metadata.gz: 4ab173be9d3c0fc4d5f3b72dd2ec56299347d00aeef9f66de8655fe3497a59485ec425500fd09c8f68892158056f4e7c5337db1125f9c6d51f55ad24be815f98
-  data.tar.gz: 74c9a5e05eb355731c486f1a84d7537f058f75cfe4d31eceedf6b9dc3748528ded19b8e013f7a2a3272c850d4e546dc3bd215a0434b79d05500d3a0aa023b07e
+  metadata.gz: 5030e872a156facb47d8a45bdfff89259833393e63dfd8699adaf51de1631faede8201f985458836b4e87654322402d867ac7f572fccef0b1e05de64495ff071
+  data.tar.gz: 48fe9c98343576e43dc10ded3f54748f7afb671e8ac1496d29e061842c74ebddb31810b6391c689c7fe6239f2afae9f24547455ce52d9497f80d4c731133bf51

data/lib/zold/commands/push.rb

@@ -69,6 +69,7 @@ Available options:"
       total = 0
       nodes = 0
       done = 0
+      start = Time.now
       @remotes.iterate(@log) do |r|
         nodes += 1
         total += push_one(id, r, opts)
@@ -76,7 +77,8 @@ Available options:"
       end
       raise "There are no remote nodes, run 'zold remote reset'" if nodes.zero?
       raise "No nodes out of #{nodes} accepted the wallet #{id}" if done.zero?
-      @log.info("Push finished to #{done} nodes out of #{nodes}, total score for #{id} is #{total}")
+      @log.info("Push finished to #{done} nodes out of #{nodes} in #{(Time.now - start).round}s, \
+total score for #{id} is #{total}")
     end
 
     def push_one(id, r, opts)
@@ -85,10 +87,12 @@ Available options:"
         return 0
       end
       start = Time.now
-      @wallets.find(id) do |wallet|
+      content = @wallets.find(id) do |wallet|
         raise "The wallet #{id} is absent" unless wallet.exists?
-        content = AtomicFile.new(wallet.path).read
-        response = r.http("/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}").put(content)
+        AtomicFile.new(wallet.path).read
+      end
+      response = r.http("/wallet/#{id}#{opts['sync'] ? '?sync=true' : ''}").put(content)
+      @wallets.find(id) do |wallet|
         if response.code == '304'
           @log.info("#{r}: same version #{content.length}b/#{wallet.txns.count}t \
 of #{wallet.id} there, in #{(Time.now - start).round(2)}s")

data/lib/zold/node/front.rb

@@ -103,8 +103,6 @@ while #{settings.address} is in '#{settings.network}'"
         require_relative '../commands/remote'
         cmd = Remote.new(remotes: settings.remotes, log: settings.log)
         cmd.run(['remote', 'add', s.host, s.port.to_s, "--network=#{settings.network}"])
-        cmd.run(%w[remote trim])
-        cmd.run(%w[remote select])
       end
     end
 
@@ -296,12 +294,14 @@ while #{settings.address} is in '#{settings.network}'"
         error 404 unless wallet.exists?
         content_type 'text/plain'
         copies = Copies.new(File.join(settings.copies, id))
-        copies.load.map { |c| "#{c[:name]}: #{c[:host]}:#{c[:port]} #{c[:score]} #{c[:time]}" }.join("\n") +
+        copies.load.map do |c|
+          "#{c[:name]}: #{c[:host]}:#{c[:port]} #{c[:score]} #{c[:time].utc.iso8601}"
+        end.join("\n") +
         "\n\n" +
         copies.all.map do |c|
           w = Wallet.new(c[:path])
           "#{c[:name]}: #{c[:score]} #{w.balance}/#{w.txns.count}t/\
-  #{w.digest[0, 6]}/#{File.size(c[:path])}b/#{Age.new(File.mtime(c[:path]))}"
+#{w.digest[0, 6]}/#{File.size(c[:path])}b/#{Age.new(File.mtime(c[:path]))}"
         end.join("\n")
       end
     end
@@ -369,6 +369,7 @@ while #{settings.address} is in '#{settings.network}'"
       status 503
       e = env['sinatra.error']
       content_type 'text/plain'
+      headers['X-Zold-Error'] = e.message
       Backtrace.new(e).to_s
     end
 

data/lib/zold/remotes.rb

@@ -82,6 +82,7 @@ module Zold
         return if response.code.to_i == code
         log.debug("#{response.code} \"#{response.message}\" at \"#{response.body}\"")
         raise "Unexpected HTTP code #{response.code}, instead of #{code}" if msg.empty?
+        raise "#{response.code}/#{response.header['X-Zold-Error']}" if response.header['X-Zold-Error']
         raise "#{msg} (HTTP code #{response.code}, instead of #{code})"
       end
 

data/lib/zold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.31
+  version: 0.14.32
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby