zold 0.13.8 → 0.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca8d9779feac251be60e6ad213446a7c0016eca8
-  data.tar.gz: 63fa88832cfa2554f9e95bd7f5582ae4498de9ee
+  metadata.gz: 0db66325fd3397cd2251d3247d035d03cdcc4c45
+  data.tar.gz: 2735aa783ca3d43c0c865de4380e8ba89091be11
 SHA512:
-  metadata.gz: ba1d0ad4977db4f9c96e42b992bc9edffab0bfc15931031b75d1b1d644befd00d42ecd6a49d4a1ea68d51c18ff2c6b352b81d0b0ab315a9916d85c4835fe65ed
-  data.tar.gz: e2bd3858fe693acd7c9c4e55733c0e6ece03ef2f843793d4e9a8db2946ea7389e96968fd8d7225b5b51055e1c76dcbceaeadc340506a45504f68261f10eacec5
+  metadata.gz: 9daea69a854a030def3d3f4f5846f939a8d63684d43505564a242e94f8215e76fea0dcdd3d550bc854d98a6959a2bbad1f34ee1c82f6c4cd6c460b69f20d5843
+  data.tar.gz: 59ce5b91d100e5cdd999bc7cabf0405561a5096def8c8a84e945f6497e3f2d13b8f875b1e43e4589d7fd8728be60e4e7ccf8092f9e965ea5b52e870fdf0d3333

data/bin/zold

@@ -38,7 +38,7 @@ require_relative '../lib/zold/remotes'
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-log = Zold::Log.new
+log = Zold::Log::Regular.new
 
 args = []
 unless ENV['RACK_ENV'] == 'test' || ARGV.find { |a| a == '--ignore-global-config' }

data/lib/zold/commands/node.rb

@@ -168,8 +168,8 @@ module Zold
     private
 
     def exec(cmd, nohup_log)
-      start = Time.now
       Open3.popen2e(cmd) do |stdin, stdout, thr|
+        start = Time.now
         nohup_log.print("Started process ##{thr.pid} from process ##{Process.pid}: #{cmd}\n")
         stdin.close
         until stdout.eof?
@@ -183,7 +183,7 @@ module Zold
         nohup_log.print("Nothing else left to read from ##{thr.pid}\n")
         code = thr.value.to_i
         nohup_log.print("Exit code of process ##{thr.pid} is #{code}, was alive for \
-#{((Time.now - start) / (60 * 60)).round} min: #{cmd}\n")
+#{((Time.now - start) / 60).round} min: #{cmd}\n")
         raise unless code.zero?
       end
     end
@@ -204,9 +204,7 @@ module Zold
           begin
             exec("#{myself} #{args.join(' ')}", nohup_log)
             exec(opts['nohup-command'], nohup_log)
-            # rubocop:disable Lint/RescueException
-          rescue Exception => e
-            # rubocop:enable Lint/RescueException
+          rescue StandardError => e
             nohup_log.print(Backtrace.new(e).to_s)
             raise e
           end

data/lib/zold/commands/remote.rb

@@ -149,21 +149,22 @@ Available options:"
     # Returns an array of Zold::Score
     def elect(opts)
       scores = []
-      @remotes.all.sample(1).each do |winner|
-        @remotes.iterate(@log, farm: @farm) do |r|
-          next if r.host != winner[:host] || r.port != winner[:port]
-          res = r.http('/').get
-          r.assert_code(200, res)
-          score = Score.parse_json(JSON.parse(res.body)['score'])
-          r.assert_valid_score(score)
-          r.assert_score_ownership(score)
-          r.assert_score_strength(score) unless opts['ignore-score-weakness']
-          r.assert_score_value(score, Tax::EXACT_SCORE) unless opts['ignore-score-value']
-          @log.info("Elected: #{score}")
-          scores << score
-        end
+      @remotes.iterate(@log, farm: @farm) do |r|
+        res = r.http('/').get
+        r.assert_code(200, res)
+        score = Score.parse_json(JSON.parse(res.body)['score'])
+        r.assert_valid_score(score)
+        r.assert_score_ownership(score)
+        r.assert_score_strength(score) unless opts['ignore-score-weakness']
+        r.assert_score_value(score, Tax::EXACT_SCORE) unless opts['ignore-score-value']
+        scores << score
+      end
+      scores = scores.sample(1)
+      if scores.empty?
+        @log.info("No winners elected out of #{@remotes.all.count} remotes")
+      else
+        @log.info("Elected: #{scores[0]}")
       end
-      @log.info("No winners elected out of #{@remotes.all.count} remotes") if scores.empty?
       scores
     end
 
@@ -190,11 +191,10 @@ Available options:"
           if opts['reboot']
             @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
 (use --never-reboot to avoid this from happening)")
-            Kernel.exit(0)
-          else
-            @log.info("#{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")
+            terminate
           end
+          @log.info("#{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")
         end
         if deep
           json['all'].each do |s|
@@ -215,5 +215,10 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
         @log.debug("There are #{total} known remotes")
       end
     end
+
+    def terminate
+      @log.info("Threads: #{Thread.list.map { |t| "#{t.name}/#{t.status}" }.join(', ')}")
+      Kernel.exit(0)
+    end
   end
 end

data/lib/zold/log.rb

@@ -28,46 +28,48 @@ STDOUT.sync = true
 # License:: MIT
 module Zold
   # Logging
-  class Log
-    MUTEX = Mutex.new
-    def self.print(text)
-      MUTEX.synchronize do
-        puts(text)
+  module Log
+    # Extra verbose log
+    class Verbose
+      def debug(msg)
+        print(msg)
       end
-    end
 
-    def debug(msg)
-      # nothing
-    end
+      def debug?
+        true
+      end
 
-    def debug?
-      false
-    end
+      def info(msg)
+        print(msg)
+      end
 
-    def info(msg)
-      Log.print(msg)
-    end
+      def info?
+        true
+      end
 
-    def info?
-      true
-    end
+      def error(msg)
+        print("#{Rainbow('ERROR').red}: #{msg}")
+      end
 
-    def error(msg)
-      Log.print("#{Rainbow('ERROR').red}: #{msg}")
+      private
+
+      def print(text)
+        puts(text)
+      end
     end
 
-    # Extra verbose log
-    class Verbose
+    # Regular log
+    class Regular
       def debug(msg)
-        Log.print(msg)
+        # nothing
       end
 
       def debug?
-        true
+        false
       end
 
       def info(msg)
-        Log.print(msg)
+        print(msg)
       end
 
       def info?
@@ -75,7 +77,13 @@ module Zold
       end
 
       def error(msg)
-        Log.print("#{Rainbow('ERROR').red}: #{msg}")
+        print("#{Rainbow('ERROR').red}: #{msg}")
+      end
+
+      private
+
+      def print(text)
+        puts(text)
       end
     end
 

data/lib/zold/metronome.rb

@@ -44,7 +44,7 @@ module Zold
           end
           sleep(1)
           step += 1
-          @log.debug("Routine #{routine.class.name} ##{step} done in #{((Time.now - start) / 60).round(2)}s")
+          @log.debug("Routine #{routine.class.name} ##{step} done in #{(Time.now - start).round(2)}s")
         end
       end
       @log.info("Added #{routine.class.name} to the metronome")
@@ -56,9 +56,9 @@ module Zold
       @threads.each do |t|
         tstart = Time.now
         t.exit
-        @log.info("Thread #{t.name} terminated in #{((Time.now - tstart) / 60).round(2)}s")
+        @log.info("Thread #{t.name} terminated in #{(Time.now - tstart).round(2)}s")
       end
-      @log.info("Metronome stopped in #{((Time.now - start) / 60).round(2)}s")
+      @log.info("Metronome stopped in #{(Time.now - start).round(2)}s")
     end
   end
 end

data/lib/zold/node/entrance.rb

@@ -106,10 +106,10 @@ module Zold
         start = Time.now
         modified = push_unsafe(id, body)
         if modified.empty?
-          @log.info("Accepted #{id} in #{((Time.now - start) / 60).round(2)}s \
+          @log.info("Accepted #{id} in #{(Time.now - start).round(2)}s \
 and modified nothing (this is most likely a bug!)")
         else
-          @log.info("Accepted #{id} in #{((Time.now - start) / 60).round(2)}s and modified #{modified.join(', ')}")
+          @log.info("Accepted #{id} in #{(Time.now - start).round(2)}s and modified #{modified.join(', ')}")
         end
         modified
       end

data/lib/zold/node/farm.rb

@@ -103,9 +103,9 @@ module Zold
       @threads.each do |t|
         tstart = Time.now
         t.exit
-        @log.info("Thread #{t.name} terminated in #{((Time.now - tstart) / 60).round(2)}s")
+        @log.info("Thread #{t.name} terminated in #{(Time.now - tstart).round(2)}s")
       end
-      @log.info("Farm stopped in #{((Time.now - start) / 60).round(2)}s")
+      @log.info("Farm stopped in #{(Time.now - start).round(2)}s")
     end
 
     private

data/lib/zold/score.rb

@@ -164,11 +164,11 @@ module Zold
     end
 
     def age_hours
-      (Time.now - @time) / 60
+      (Time.now - @time) / (60 * 60)
     end
 
     def expired?(hours = 24)
-      @time < Time.now - hours * 60 * 60
+      age_hours > hours
     end
 
     def prefix

data/lib/zold/version.rb

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

data/test/commands/routines/test_bonuses.rb

@@ -40,7 +40,7 @@ class TestBonuses < Minitest::Test
       }
       routine = Zold::Routines::Bonuses.new(
         opts, home.wallets, home.remotes, home.copies(wallet).root,
-        Zold::Farm::Empty, log: test_log
+        Zold::Farm::Empty.new, log: test_log
       )
       routine.exec
     end

metadata

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