zold 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46e01de25675dbc6bec24662ef39de37cb5028aa
-  data.tar.gz: 5bbd7fa013ed6fc43f38e6c0ebae00e02514b202
+  metadata.gz: 56ce9c058ad3adfea8a2bec57f2d27fb85aa71a8
+  data.tar.gz: 58177571a9f14a1be47390a0a1b4c5c0bbfbd8f7
 SHA512:
-  metadata.gz: 82d392d2cb1cadb74181bd80411c1b36ebf4fb2b2419291be150aef932d7efd7e511223768faffb4b87610a8f1e6a8d1a7ae8dee693509f75e6007cd79e2dc18
-  data.tar.gz: 3b1dd2c77ceb4f7652d26ddb38e03d8c2d5e88283b34411369b5220b69e9342c388fb74f494689456238e95df1b9ecc49f2bc388fe64e875ecf83d2850dd9b58
+  metadata.gz: 5872e18495a0c45c1218959e4f2dd96ca5a2de4632ce725e4ce74a97bde73627d0a52187c4108b3788dc9974f541522af9e2f8a750ef42188b31d3089a0c6fad
+  data.tar.gz: 121ba02407f26bd00e71127f62de8508bd9bfab724510a148d9e9862ceb3dda218b7d16657fb9a4ec0296415db7d63761b23aa076044d58ca0dc24be602f4eb2

data/bin/zold

@@ -175,6 +175,6 @@ Available options:"
   end
 rescue StandardError => ex
   log.error("#{ex.message} (#{ex.class.name})")
-  puts ex.backtrace if opts['trace']
+  puts(ex.backtrace) if opts['trace']
   exit -1
 end

data/lib/zold/backtrace.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Backtrace.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Backtrace of an exception
+  class Backtrace
+    def initialize(error)
+      @error = error
+    end
+
+    def to_s
+      "#{@error.class.name}: #{@error.message}\n#{@error.backtrace.join("\n\t")}"
+    end
+  end
+end

data/lib/zold/commands/merge.rb

@@ -21,6 +21,7 @@
 require 'slop'
 require 'rainbow'
 require_relative 'args'
+require_relative '../backtrace'
 require_relative '../log'
 require_relative '../id'
 require_relative '../wallet'
@@ -90,8 +91,8 @@ Available options:"
     def merge_one(patch, wallet, name)
       patch.join(wallet)
     rescue StandardError => e
-      @log.error("Can't merge a copy coming from #{name}; #{e.class.name}: #{e.message}")
-      @log.debug(e.backtrace.join("\n\t"))
+      @log.error("Can't merge a copy coming from #{name}: #{e.message}")
+      @log.debug(Backtrace.new(e).to_s)
     end
   end
 end

data/lib/zold/commands/node.rb

@@ -21,6 +21,7 @@
 require 'slop'
 require_relative '../version'
 require_relative '../score'
+require_relative '../backtrace'
 require_relative '../metronome'
 require_relative '../wallets'
 require_relative '../remotes'
@@ -169,12 +170,16 @@ module Zold
         nohup_log.print("Started process ##{thr.pid} from process ##{Process.pid}: #{cmd}\n")
         stdin.close
         until stdout.eof?
-          line = stdout.gets
+          begin
+            line = stdout.gets
+          rescue IOError => e
+            line = Backtrace.new(e).to_s
+          end
           nohup_log.print(line)
         end
         code = thr.value.to_i
         nohup_log.print("Exit code of process ##{thr.pid} is #{code}: #{cmd}\n")
-        raise "Exit code #{code} (non zero)" unless code.zero?
+        raise unless code.zero?
       end
     end
 
@@ -190,9 +195,12 @@ module Zold
         end
         myself = File.expand_path($PROGRAM_NAME)
         loop do
-          VerboseThread.new.run do
+          begin
             exec("#{myself} #{ARGV.delete_if { |a| a.start_with?('--nohup') }.join(' ')}", nohup_log)
             exec(opts['nohup-command'], nohup_log)
+          rescue StandardError => e
+            nohup_log.print(Backtrace.new(e).to_s)
+            raise e
           end
         end
       end

data/lib/zold/commands/remote.rb

@@ -163,6 +163,7 @@ Available options:"
           scores << score
         end
       end
+      @log.info("No winners elected out of #{@remotes.all.count} remotes") if scores.empty?
       scores
     end
 

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

@@ -42,17 +42,14 @@ module Zold
       end
 
       def exec(_ = 0)
-        sleep(60 * 60) unless @opts['routine-immediately']
+        sleep(10 * 60) unless @opts['routine-immediately']
         raise '--private-key is required to pay bonuses' unless @opts['private-key']
         raise '--bonus-wallet is required to pay bonuses' unless @opts['bonus-wallet']
         raise '--bonus-amount is required to pay bonuses' unless @opts['bonus-amount']
         winners = Remote.new(remotes: @remotes, log: @log, farm: @farm).run(
           ['remote', 'elect', @opts['bonus-wallet'], '--private-key', @opts['private-key']]
         )
-        if winners.empty?
-          @log.info('No winners elected, won\'t pay any bonuses')
-          return
-        end
+        return if winners.empty?
         winners.each do |score|
           Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
             ['pull', opts['bonus-wallet']]

data/lib/zold/http.rb

@@ -21,6 +21,7 @@
 require 'rainbow'
 require 'uri'
 require 'net/http'
+require_relative 'backtrace'
 require_relative 'version'
 require_relative 'score'
 
@@ -83,7 +84,7 @@ module Zold
       end
 
       def body
-        @ex.message + "\n" + @ex.backtrace.join("\n\t")
+        Backtrace.new(@ex).to_s
       end
 
       def code

data/lib/zold/node/front.rb

@@ -25,6 +25,7 @@ require 'sinatra/base'
 require 'webrick'
 require 'diffy'
 require 'concurrent'
+require_relative '../backtrace'
 require_relative '../version'
 require_relative '../wallet'
 require_relative '../log'
@@ -203,7 +204,7 @@ module Zold
       status 503
       e = env['sinatra.error']
       content_type 'text/plain'
-      "#{e.message}\n\t#{e.backtrace.join("\n\t")}"
+      Backtrace.new(e).to_s
     end
 
     private

data/lib/zold/remotes.rb

@@ -21,6 +21,7 @@
 require 'csv'
 require 'uri'
 require 'fileutils'
+require_relative 'backtrace'
 require_relative 'node/farm'
 require_relative 'atomic_file'
 
@@ -157,7 +158,7 @@ module Zold
           error(r[:host], r[:port])
           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"))
+          log.debug(Backtrace.new(e).to_s)
           remove(r[:host], r[:port]) if errors > Remotes::TOLERANCE
         end
       end

data/lib/zold/verbose_thread.rb

@@ -19,6 +19,7 @@
 # SOFTWARE.
 
 require_relative 'log'
+require_relative 'backtrace'
 
 # Verbose thread.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -34,8 +35,7 @@ module Zold
     def run(safe = false)
       yield
     rescue StandardError => e
-      @log.error("#{e.class.name}: #{e.message}")
-      @log.debug(e.backtrace.join("\n\t"))
+      @log.error(Backtrace.new(e).to_s)
       raise e unless safe
     end
   end

data/lib/zold/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -321,6 +321,7 @@ files:
 - lib/zold.rb
 - lib/zold/amount.rb
 - lib/zold/atomic_file.rb
+- lib/zold/backtrace.rb
 - lib/zold/commands/args.rb
 - lib/zold/commands/calculate.rb
 - lib/zold/commands/clean.rb