front.rb in zold-0.14.36

- old
+ new

@@ -25,10 +25,11 @@
 require 'json'
 require 'sinatra/base'
 require 'webrick'
 require 'get_process_mem'
 require 'diffy'
+require 'usagewatch_ext'
 require 'concurrent'
 require_relative '../backtrace'
 require_relative '../version'
 require_relative '../wallet'
 require_relative '../copies'
@@ -64,11 +65,11 @@
       set :logging, true # to be injected at node.rb
       set :address, nil? # to be injected at node.rb
       set :farm, nil? # to be injected at node.rb
       set :metronome, nil? # to be injected at node.rb
       set :entrance, nil? # to be injected at node.rb
-      set :network, nil? # to be injected at node.rb
+      set :network, 'test' # to be injected at node.rb
       set :wallets, nil? # to be injected at node.rb
       set :remotes, nil? # to be injected at node.rb
       set :copies, nil? # to be injected at node.rb
       set :node_alias, nil? # to be injected at node.rb
     end
@@ -160,16 +161,17 @@
         network: settings.network,
         protocol: settings.protocol,
         score: score.to_h,
         pid: Process.pid,
         cpus: Concurrent.processor_count,
-        memory: GetProcessMem.new.bytes,
+        memory: GetProcessMem.new.bytes.to_i,
         platform: RUBY_PLATFORM,
+        load: Usagewatch.uw_load.to_f,
         uptime: `uptime`.strip,
         threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}",
         wallets: settings.wallets.all.count,
         remotes: settings.remotes.all.count,
-        nscore: settings.remotes.all.map { |r| r[:score] }.inject(&:+),
+        nscore: settings.remotes.all.map { |r| r[:score] }.inject(&:+) || 0,
         farm: settings.farm.to_json,
         entrance: settings.entrance.to_json,
         date: Time.now.utc.iso8601,
         hours_alive: ((Time.now - settings.start) / (60 * 60)).round(2),
         home: 'https://www.zold.io'