zold 0.14.37 → 0.14.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e60384f0c0c624aa8351fbb37ba157ab55ecec6c
-  data.tar.gz: 45c724b470053a6d46787589ff8a8815f8bd2dc2
+  metadata.gz: b3fc39017077100e9934e90a71f121139e4a1432
+  data.tar.gz: da8496c1bdfa6398785e5a7ab464eff0a45e02a9
 SHA512:
-  metadata.gz: '08171d0370b3d30ae360159cc144fe7fb687110c09bad086b3c7ce37b984f49e76419dd864d55a22696e0a582a6b569b4ffb43ec04ec01c9dfdae30b144708b5'
-  data.tar.gz: cdd6f7908645858c273be17c94b3741aab8a5dd15fdfff65450a9d01ad79f34d97d290942c1529342eed4c31785fed78a650ad556b2dfe2036c25d8ba20e3514
+  metadata.gz: b2a9f4c3b526399c34bf84c05a66c90db67e39649ea6347abd74bf2428b848128991a73810ff06d9a421e2967140de674fa177b52bfa3f82d5e8bdf69fa4f25e
+  data.tar.gz: 85720186b77dec3343a10968310d0001a94940722490e2041b55c593ee7b230f8ebb6a5f9112622e10b78e717abd9778cc24f1b0b142d7d79dec485717638c48

data/.gitignore

@@ -7,3 +7,4 @@ Gemfile.lock
 rdoc/
 .zoldata
 farm
+zold.log

data/fixtures/scripts/redeploy-on-upgrade.sh

@@ -4,7 +4,7 @@ function start_node {
   mkdir $1
   cd $1
   zold remote clean
-  zold node $3 --nohup --nohup-command='touch restarted' --nohup-log=log --nohup-max-cycles=0 \
+  zold node $3 --nohup --nohup-command='touch restarted' --nohup-log=log --nohup-max-cycles=0 --nohup-log-truncate=10240 \
     --expose-version=$2 --save-pid=pid --routine-immediately \
     --verbose --trace --invoice=REDEPLOY@ffffffffffffffff \
     --host=localhost --port=$1 --bind-port=$1 --threads=0 > /dev/null 2>&1

data/lib/zold/commands/node.rb

@@ -96,6 +96,9 @@ module Zold
         o.string '--nohup-log',
           'The file to log output into (default: zold.log)',
           default: 'zold.log'
+        o.integer '--nohup-log-truncate',
+          'The maximum amount of bytes to keep in the file, and truncate it in half if it grows bigger',
+          default: 1024 * 1024
         o.string '--halt-code',
           'The value of HTTP query parameter "halt," which will cause the front-end immediate termination',
           default: ''
@@ -138,7 +141,7 @@ module Zold
         return
       end
       raise '--invoice is mandatory' unless opts['invoice']
-      if opts[:nohup]
+      if opts['nohup']
         pid = nohup(opts)
         File.write(opts['save-pid'], pid) if opts['save-pid']
         @log.debug("Process ID #{pid} saved into \"#{opts['save-pid']}\"")
@@ -148,6 +151,7 @@ module Zold
       @log = Trace.new(@log, opts['trace-length'])
       Front.set(:log, @log)
       Front.set(:trace, @log)
+      Front.set(:nohup_log, opts['nohup-log']) if opts['nohup-log']
       Front.set(:version, opts['expose-version'])
       Front.set(:protocol, Zold::PROTOCOL)
       Front.set(:logging, @log.debug?)
@@ -264,7 +268,7 @@ module Zold
 
     def nohup(opts)
       pid = fork do
-        nohup_log = NohupLog.new(opts['nohup-log'])
+        nohup_log = NohupLog.new(opts['nohup-log'], opts['nohup-log-truncate'])
         Signal.trap('HUP') do
           nohup_log.print("Received HUP, ignoring...\n")
         end
@@ -273,7 +277,7 @@ module Zold
           exit(-1)
         end
         myself = File.expand_path($PROGRAM_NAME)
-        args = ARGV.delete_if { |a| a.start_with?('--nohup', '--home') }
+        args = ARGV.delete_if { |a| a.start_with?('--home') || a == '--nohup' }
         cycle = 0
         loop do
           begin
@@ -326,12 +330,37 @@ module Zold
 
     # Log facility for nohup
     class NohupLog
-      def initialize(file)
+      def initialize(file, max)
         @file = file
+        raise "Truncation size is too small (#{max}), should be over 10Kb" if max < 10 * 1024
+        @max = max
       end
 
       def print(data)
         File.open(@file, 'a') { |f| f.print(data) }
+        return if File.size(@file) < @max
+        temp = Tempfile.new
+        total = copy(@file, temp)
+        unit = File.size(@file) / total
+        tail = total - @max / (2 * unit)
+        copy(temp, @file, tail)
+        File.delete(temp)
+        File.open(@file, 'a') do |f|
+          f.print("The file was truncated, because it was over the quota of #{@max} bytes, \
+#{tail} lines left out of #{total}, average line length was #{unit} bytes\n\n")
+        end
+      end
+
+      def copy(source, target, start = 0)
+        total = 0
+        File.open(target, 'w') do |t|
+          File.open(source, 'r').each do |line|
+            next unless total >= start
+            t.print(line)
+            total += 1
+          end
+        end
+        total
       end
     end
 

data/lib/zold/copies.rb

@@ -34,6 +34,9 @@ require_relative 'backtrace'
 module Zold
   # All copies
   class Copies
+    # Extension for copy files
+    EXT = '.zc'
+
     def initialize(dir, log: Log::Quiet.new)
       raise 'Dir can\'t be nil' if dir.nil?
       @dir = dir
@@ -57,7 +60,7 @@ module Zold
         save(list)
         deleted = 0
         files.each do |f|
-          next unless list.find { |s| s[:name] == File.basename(f, Wallet::EXTENSION) }.nil?
+          next unless list.find { |s| s[:name] == File.basename(f, Copies::EXT) }.nil?
           file = File.join(@dir, f)
           size = File.size(file)
           File.delete(file)
@@ -99,17 +102,17 @@ module Zold
         FileUtils.mkdir_p(@dir)
         list = load
         target = list.find do |s|
-          f = File.join(@dir, "#{s[:name]}#{Wallet::EXTENSION}")
+          f = File.join(@dir, "#{s[:name]}#{Copies::EXT}")
           File.exist?(f) && AtomicFile.new(f).read == content
         end
         if target.nil?
           max = Dir.new(@dir)
-            .select { |f| File.basename(f, Wallet::EXTENSION) =~ /^[0-9]+$/ }
+            .select { |f| File.basename(f, Copies::EXT) =~ /^[0-9]+$/ }
             .map(&:to_i)
             .max
           max = 0 if max.nil?
           name = (max + 1).to_s
-          AtomicFile.new(File.join(@dir, "#{name}#{Wallet::EXTENSION}")).write(content)
+          AtomicFile.new(File.join(@dir, "#{name}#{Copies::EXT}")).write(content)
         else
           name = target[:name]
         end
@@ -131,7 +134,7 @@ module Zold
         load.group_by { |s| s[:name] }.map do |name, scores|
           {
             name: name,
-            path: File.join(@dir, "#{name}#{Wallet::EXTENSION}"),
+            path: File.join(@dir, "#{name}#{Copies::EXT}"),
             score: scores.select { |s| s[:time] > Time.now - 24 * 60 * 60 }
               .map { |s| s[:score] }
               .inject(&:+) || 0
@@ -169,11 +172,11 @@ module Zold
     end
 
     def files
-      Dir.new(@dir).select { |f| File.basename(f, Wallet::EXTENSION) =~ /^[0-9]+$/ }
+      Dir.new(@dir).select { |f| File.basename(f, Copies::EXT) =~ /^[0-9]+$/ }
     end
 
     def file
-      File.join(@dir, "scores#{Wallet::EXTENSION}")
+      File.join(@dir, "scores#{Copies::EXT}")
     end
   end
 end

data/lib/zold/node/farm.rb

@@ -77,6 +77,7 @@ module Zold
       @log.info('Zero-threads farm won\'t score anything!') if threads.zero?
       cleanup(host, port, strength, threads)
       @log.info("#{@pipeline.size} scores pre-loaded, the best is: #{best[0]}")
+      @alive = true
       @threads = (1..threads).map do |t|
         Thread.new do
           Thread.current.abort_on_exception = true
@@ -89,17 +90,17 @@ module Zold
           end
         end
       end
-      @alive = true
       @cleanup = Thread.new do
         Thread.current.abort_on_exception = true
         Thread.current.name = 'cleanup'
         loop do
-          a = [0..600].take_while do
+          max = 600
+          a = (0..max).take_while do
             sleep 0.1
             @alive
           end
-          unless a.count == 600
-            @log.info("It's time to stop the cleanup thread...")
+          unless a.count == max
+            @log.info("It's time to stop the cleanup thread (#{a.count} != #{max}, alive=#{@alive})...")
             break
           end
           VerboseThread.new(@log).run do
@@ -181,8 +182,10 @@ module Zold
           loop do
             begin
               buffer << stdout.read_nonblock(1024)
-            rescue IO::WaitReadable => e
-              @log.debug("Still waiting for the data from the process ##{thr.pid}: #{e.message}")
+              # rubocop:disable Lint/HandleExceptions
+            rescue IO::WaitReadable => _
+              # rubocop:enable Lint/HandleExceptions
+              # nothing to do here
             end
             if buffer.end_with?("\n") && thr.value.to_i.zero?
               score = Score.parse(buffer.strip)

data/lib/zold/node/front.rb

@@ -62,6 +62,7 @@ module Zold
       set :protocol, PROTOCOL # to be injected at node.rb
       set :ignore_score_weakness, false # to be injected at node.rb
       set :reboot, false # to be injected at node.rb
+      set :nohup_log, false # to be injected at node.rb
       set :home, nil? # to be injected at node.rb
       set :logging, true # to be injected at node.rb
       set :address, nil? # to be injected at node.rb
@@ -144,6 +145,14 @@ while #{settings.address} is in '#{settings.network}'"
       settings.trace.to_s
     end
 
+    get '/nohup_log' do
+      raise 'Run it with --nohup in order to see this log' if settings.nohup_log.nil?
+      raise "Log not found at #{settings.nohup_log}" unless File.exist?(settings.nohup_log)
+      response.headers['Content-Type'] = 'text/plain'
+      response.headers['Content-Disposition'] = "attachment; filename='#{File.basename(settings.nohup_log)}'"
+      File.read(settings.nohup_log)
+    end
+
     get '/favicon.ico' do
       if score.value >= 16
         redirect 'https://www.zold.io/images/logo-green.png'

data/lib/zold/version.rb

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

data/test/commands/test_merge.rb

@@ -142,7 +142,7 @@ class TestMerge < Minitest::Test
     Dir.new(base).select { |f| File.directory?(File.join(base, f)) && !f.start_with?('.') }.each do |f|
       Dir.mktmpdir do |dir|
         FileUtils.cp_r(File.join('fixtures/merge', "#{f}/."), dir)
-        scores = File.join(dir, 'copies/0123456789abcdef/scores.z')
+        scores = File.join(dir, "copies/0123456789abcdef/scores#{Zold::Copies::EXT}")
         File.write(scores, File.read(scores).gsub(/NOW/, Time.now.utc.iso8601))
         FileUtils.cp('fixtures/merge/asserts.rb', dir)
         wallets = Zold::Wallets.new(dir)

data/test/test_copies.rb

@@ -73,10 +73,10 @@ class TestCopies < Minitest::Test
       copies = Zold::Copies.new(dir, log: test_log)
       copies.add(content('h1'), 'zold.io', 4096, 10, Time.now - 25 * 60 * 60)
       copies.add(content('h1'), 'zold.io', 4097, 20, Time.now - 26 * 60 * 60)
-      assert(File.exist?(File.join(dir, "1#{Zold::Wallet::EXTENSION}")))
+      assert(File.exist?(File.join(dir, "1#{Zold::Copies::EXT}")))
       copies.clean
       assert(copies.all.empty?, "#{copies.all.count} is not empty")
-      assert(!File.exist?(File.join(dir, "1#{Zold::Wallet::EXTENSION}")))
+      assert(!File.exist?(File.join(dir, "1#{Zold::Copies::EXT}")))
     end
   end
 

data/test/test_zold.rb

@@ -34,7 +34,7 @@ require_relative '../lib/zold/version'
 class TestZold < Minitest::Test
   def test_all_scripts
     Dir.new('fixtures/scripts').select { |f| f =~ /\.sh$/ && !f.start_with?('_') }.each do |f|
-      # next unless f == 'pull-on-start.sh'
+      # next unless f == 'redeploy-on-upgrade.sh'
       Dir.mktmpdir do |dir|
         FileUtils.cp('fixtures/id_rsa.pub', dir)
         FileUtils.cp('fixtures/id_rsa', dir)

data/zold.log

@@ -0,0 +1,12 @@
+The file was truncated, because it was over the quota of 1024 bytes, 9 lines left out of 16, average line length was 66 bytes
+
+94.103.80.24:4096 found at 109.234.37.76:4096/0 and added
+178.128.41.66:4096 added to the list, 21 total
+178.128.41.66:4096 found at 109.234.37.76:4096/0 and added
+109.234.37.76:4096: The node 62.113.238.234:4096 is not responding (code is 599) in 27s
+RuntimeError: The node 62.113.238.234:4096 is not responding (code is 599)
+	/Volumes/ssd2/code/zold/zold/lib/zold/commands/remote.rb:170:in `add'
+	/Volumes/ssd2/code/zold/zold/lib/zold/commands/remote.rb:237:in `block (2 levels) in update'
+	/Volumes/ssd2/code/zold/zold/lib/zold/commands/remote.rb:236:in `each'
+	/Volumes/ssd2/code/zold/zold/lib/zold/commands/remote.rb:236:in `block in update'
+	/Volumes/ssd2/code/zold/zold/lib/zold/remotes.rb:193:in `block (2 levels) in iterate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.37
+  version: 0.14.38
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -430,22 +430,22 @@ files:
 - fixtures/merge/id_rsa
 - fixtures/merge/id_rsa.pub
 - fixtures/merge/into-no-wallet/assert.rb
-- fixtures/merge/into-no-wallet/copies/0123456789abcdef/1.z
-- fixtures/merge/into-no-wallet/copies/0123456789abcdef/scores.z
+- fixtures/merge/into-no-wallet/copies/0123456789abcdef/1.zc
+- fixtures/merge/into-no-wallet/copies/0123456789abcdef/scores.zc
 - fixtures/merge/random-expenses/0000000000000000.z
 - fixtures/merge/random-expenses/0123456789abcdef.z
 - fixtures/merge/random-expenses/assert.rb
-- fixtures/merge/random-expenses/copies/0123456789abcdef/1.z
-- fixtures/merge/random-expenses/copies/0123456789abcdef/2.z
-- fixtures/merge/random-expenses/copies/0123456789abcdef/3.z
-- fixtures/merge/random-expenses/copies/0123456789abcdef/4.z
-- fixtures/merge/random-expenses/copies/0123456789abcdef/5.z
-- fixtures/merge/random-expenses/copies/0123456789abcdef/scores.z
+- fixtures/merge/random-expenses/copies/0123456789abcdef/1.zc
+- fixtures/merge/random-expenses/copies/0123456789abcdef/2.zc
+- fixtures/merge/random-expenses/copies/0123456789abcdef/3.zc
+- fixtures/merge/random-expenses/copies/0123456789abcdef/4.zc
+- fixtures/merge/random-expenses/copies/0123456789abcdef/5.zc
+- fixtures/merge/random-expenses/copies/0123456789abcdef/scores.zc
 - fixtures/merge/simple-case/0000000000000000.z
 - fixtures/merge/simple-case/0123456789abcdef.z
 - fixtures/merge/simple-case/assert.rb
-- fixtures/merge/simple-case/copies/0123456789abcdef/1.z
-- fixtures/merge/simple-case/copies/0123456789abcdef/scores.z
+- fixtures/merge/simple-case/copies/0123456789abcdef/1.zc
+- fixtures/merge/simple-case/copies/0123456789abcdef/scores.zc
 - fixtures/scripts/_head.sh
 - fixtures/scripts/calculate-scores.sh
 - fixtures/scripts/distribute-wallet.sh
@@ -582,6 +582,7 @@ files:
 - upgrades/protocol_up.rb
 - upgrades/rename_foreign_wallets.rb
 - zold.gemspec
+- zold.log
 homepage: http://github.com/zold-io/zold
 licenses:
 - MIT