zold 0.13.19 → 0.13.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/heroku.yml +1 -1
- data/lib/zold/commands/fetch.rb +1 -1
- data/lib/zold/commands/node.rb +1 -0
- data/lib/zold/node/farm.rb +5 -4
- data/lib/zold/node/front.rb +2 -2
- data/lib/zold/version.rb +1 -1
- data/test/node/test_front.rb +5 -0
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7624ccdaec6f4098e5e024189d4345e8805d7095
|
4
|
+
data.tar.gz: 585ad1cbafa0e8424d1017b3983156c94af543f5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f0212c757e122fd6c2429959a42e73c4972022c2471f7e24e248d5f69c6e20cfb3d004813c36f64221a9f16b6e5d5de9d3e2a87a7a90fc99c085b02a648b27d2
|
7
|
+
data.tar.gz: 320d3092ef14317b3566d92b98aa238bd56a82714e3fb54b850100bec75650259c266fac08c16f0fef8236bb378f0fd5f41a90dde0a3002ee3ab78a8c82675c2
|
data/heroku.yml
CHANGED
@@ -4,7 +4,7 @@ build:
|
|
4
4
|
config:
|
5
5
|
LC_ALL: UTF-8
|
6
6
|
run:
|
7
|
-
web: "./bin/zold node --no-colors --trace
|
7
|
+
web: "./bin/zold node --no-colors --trace --verbose
|
8
8
|
--bind-port=$PORT --port=80 --host=b1.zold.io --threads=0
|
9
9
|
--invoice=ML5Ern7m@912ecc24b32dbe74 --never-reboot
|
10
10
|
--bonus-wallet=81c9c25789b03876 --private-key=bonus.key --bonus-amount=1 --bonus-time=60"
|
data/lib/zold/commands/fetch.rb
CHANGED
@@ -79,7 +79,7 @@ Available options:"
|
|
79
79
|
start = Time.now
|
80
80
|
if opts['ignore-node'].include?(r.to_s)
|
81
81
|
@log.debug("#{r} ignored because of --ignore-node")
|
82
|
-
return
|
82
|
+
return 0
|
83
83
|
end
|
84
84
|
res = r.http("/wallet/#{id}").get
|
85
85
|
raise "Wallet #{id} not found" if res.code == '404'
|
data/lib/zold/commands/node.rb
CHANGED
data/lib/zold/node/farm.rb
CHANGED
@@ -51,7 +51,7 @@ module Zold
|
|
51
51
|
|
52
52
|
def to_json
|
53
53
|
{
|
54
|
-
threads: @threads.
|
54
|
+
threads: @threads.map { |t| "#{t.name}/#{t.status}" }.join(', '),
|
55
55
|
scores: @scores.size,
|
56
56
|
best: @best.count,
|
57
57
|
history: history.count
|
@@ -77,7 +77,7 @@ module Zold
|
|
77
77
|
VerboseThread.new(@log).run do
|
78
78
|
Thread.current.name = 'farm-cleaner'
|
79
79
|
loop do
|
80
|
-
sleep(60)
|
80
|
+
sleep(60) unless strength == 1 # which will only happen in tests
|
81
81
|
clean(host, port, strength, threads)
|
82
82
|
end
|
83
83
|
end
|
@@ -110,7 +110,8 @@ module Zold
|
|
110
110
|
@scores << zero
|
111
111
|
@best << zero
|
112
112
|
end
|
113
|
-
@best = @best.reject(&:expired?).sort_by(&:value).reverse
|
113
|
+
@best = @best.reject(&:expired?).sort_by(&:value).reverse
|
114
|
+
@best = @best.take(threads) unless threads.zero?
|
114
115
|
end
|
115
116
|
|
116
117
|
def cycle(host, port, strength, threads)
|
@@ -125,8 +126,8 @@ module Zold
|
|
125
126
|
before = @best.map(&:value).max
|
126
127
|
save(n)
|
127
128
|
@best << n
|
128
|
-
after = @best.map(&:value).max
|
129
129
|
clean(host, port, strength, threads)
|
130
|
+
after = @best.map(&:value).max
|
130
131
|
@log.debug("#{Thread.current.name}: best score is #{@best[0]}") if before != after && !after.zero?
|
131
132
|
end
|
132
133
|
@scores << n
|
data/lib/zold/node/front.rb
CHANGED
@@ -199,7 +199,7 @@ module Zold
|
|
199
199
|
not_found do
|
200
200
|
status 404
|
201
201
|
content_type 'text/plain'
|
202
|
-
|
202
|
+
"Page not found: #{request.url}"
|
203
203
|
end
|
204
204
|
|
205
205
|
error 400 do
|
@@ -219,7 +219,7 @@ module Zold
|
|
219
219
|
|
220
220
|
def score
|
221
221
|
best = settings.farm.best
|
222
|
-
|
222
|
+
raise 'Score is empty, there is something wrong with the Farm!' if best.empty?
|
223
223
|
best[0]
|
224
224
|
end
|
225
225
|
end
|
data/lib/zold/version.rb
CHANGED
data/test/node/test_front.rb
CHANGED
@@ -84,7 +84,12 @@ class FrontTest < Minitest::Test
|
|
84
84
|
end
|
85
85
|
end
|
86
86
|
|
87
|
+
# @todo #239:30min This tests is skipped since it crashes sporadically.
|
88
|
+
# Let's investigate and make it stable. I don't really know what's going
|
89
|
+
# on, but suspect some collision between threads:
|
90
|
+
# http://www.rultor.com/t/14940-397702802
|
87
91
|
def test_pushes_twice
|
92
|
+
skip
|
88
93
|
FakeNode.new(log: test_log).run do |port|
|
89
94
|
FakeHome.new.run do |home|
|
90
95
|
wallet = home.create_wallet
|