zold 0.16.10 → 0.16.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bdb355d25ef5197cfcc131d383d5391bec683efb8f5db52ba6b60d690bf4e3f
-  data.tar.gz: dc2f83cf4bdbc787de4232aa56fb3570f721f887b93069b4fa766fc0eeee2597
+  metadata.gz: 7821595a3b9487ea3138bbee7e70a4f6b960004d7e91a08147f5760a3bd6125c
+  data.tar.gz: 37450f49b0f2d5e47ba9476ac83d14667eac4cf6b5b65fc10dd142fb8584b6ee
 SHA512:
-  metadata.gz: de19e0642f74972e9a28f7506fea7397d51473d7bc308b0da64353e9177cea7c2f16a56f1f0ca537f15f90d8001b6625c9762b9f1294eda20888539dc018c890
-  data.tar.gz: 19275bbdfe0cc8baea050d14656edcacad9b1d87846f4ddd9752f85517c20009515079c46050727bbb843b8448a5bd5feebcf8406584536720f9323c565b5011
+  metadata.gz: 3d09fdf2081fb1494a1e06b1b28ba8644b5cf4bf7197a6501811dd1f918ca5c7ac5979d1abc6f3b33fd80043922875a87ffe49f51a96c289ed27a2619aef8a6c
+  data.tar.gz: 53b7bb8a8ded97904c9182f4bcc073b85d22b4b3b1cf1b878111a26c07d5c674880d8890e32bc398a1fb4262471b313d1f6b3ce9b644035d0f65a599b5641a3e

data/lib/zold/node/farmers.rb

@@ -23,6 +23,7 @@
 require 'open3'
 require 'backtrace'
 require 'zold/score'
+require 'shellwords'
 require_relative '../log'
 require_relative '../age'
 
@@ -50,7 +51,17 @@ module Zold
         start = Time.now
         bin = File.expand_path(File.join(File.dirname(__FILE__), '../../../bin/zold'))
         raise "Zold binary not found at #{bin}" unless File.exist?(bin)
-        Open3.popen2e("ruby #{bin} --skip-upgrades --low-priority next \"#{score}\"") do |stdin, stdout, thr|
+        cmd = [
+          'ruby',
+          Shellwords.escape(bin),
+          '--skip-upgrades',
+          Shellwords.escape("--info-thread=#{Thread.current.name}"),
+          Shellwords.escape("--info-start=#{Time.now.utc.iso8601}"),
+          '--low-priority',
+          'next',
+          Shellwords.escape(score)
+        ].join(' ')
+        Open3.popen2e(cmd) do |stdin, stdout, thr|
           Thread.current.thread_variable_set(:pid, thr.pid.to_s)
           @log.debug("Scoring started in proc ##{thr.pid} \
 for #{score.value}/#{score.strength} at #{score.host}:#{score.port}")

data/lib/zold/node/front.rb

@@ -26,9 +26,6 @@ require 'eventmachine'
 require 'thin'
 require 'json'
 require 'sinatra/base'
-require 'get_process_mem'
-require 'diffy'
-require 'usagewatch_ext'
 require 'concurrent'
 require 'backtrace'
 require 'zache'
@@ -188,10 +185,19 @@ in #{Age.new(@start, limit: 1)}")
         protocol: settings.protocol,
         score: score.to_h,
         pid: Process.pid,
-        cpus: settings.zache.get(:cpus) { Concurrent.processor_count },
-        memory: GetProcessMem.new.bytes.to_i,
+        processes: processes_count,
+        cpus: settings.zache.get(:cpus) do
+          Concurrent.processor_count
+        end,
+        memory: settings.zache.get(:load, lifetime: 5 * 60) do
+          require 'get_process_mem'
+          GetProcessMem.new.bytes.to_i
+        end,
         platform: RUBY_PLATFORM,
-        load: settings.zache.get(:load, lifetime: 5 * 60) { Usagewatch.uw_load.to_f },
+        load: settings.zache.get(:load, lifetime: 5 * 60) do
+          require 'usagewatch_ext'
+          Usagewatch.uw_load.to_f
+        end,
         threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}",
         wallets: total_wallets,
         remotes: all_remotes.count,
@@ -397,6 +403,11 @@ in #{Age.new(@start, limit: 1)}")
       ].flatten.join("\n\n")
     end
 
+    get '/ps' do
+      content_type('text/plain')
+      `ps ax`
+    end
+
     not_found do
       status(404)
       content_type('text/plain')
@@ -442,6 +453,12 @@ in #{Age.new(@start, limit: 1)}")
       end
     end
 
+    def processes_count
+      settings.zache.get(:processes, lifetime: settings.network == Wallet::MAIN_NETWORK ? 60 : 0) do
+        `ps ax | grep zold | wc -l`
+      end
+    end
+
     def score
       settings.zache.get(:score, lifetime: settings.network == Wallet::MAIN_NETWORK ? 60 : 0) do
         b = settings.farm.best

data/lib/zold/version.rb

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

data/test/commands/test_clean.rb

@@ -44,6 +44,12 @@ class TestClean < Minitest::Test
     end
   end
 
+  def test_cleans_empty_wallets
+    FakeHome.new(log: test_log).run do |home|
+      Zold::Clean.new(wallets: home.wallets, copies: File.join(home.dir, 'c'), log: test_log).run(['clean'])
+    end
+  end
+
   def test_cleans_copies_in_threads
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet

data/test/node/test_front.rb

@@ -67,7 +67,8 @@ class FrontTest < Minitest::Test
           '/metronome',
           '/score',
           '/trace',
-          '/threads'
+          '/threads',
+          '/ps'
         ],
         '404' => [
           '/this-is-absent',

metadata

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