zold 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5af52af45ba9dfdd220e85af79232f92b919255
-  data.tar.gz: '0880267133e607466adbadaa5d12ce8361ea7ab5'
+  metadata.gz: 5f2635ac65d327c6ef19ec965976a6de7961fce5
+  data.tar.gz: 9a5cb6ef5aab7e9217a0131eac7fa422a95fb559
 SHA512:
-  metadata.gz: f94d22443de183a1b6e2be4cabe0880384efd1941adbf082b865f5cabe91d735def081a18a045550fea718a8e8bebe34dc51778c55702e62137bcea147c10d0e
-  data.tar.gz: ccfcbbbc989f51cf00def91844f12ba763c66e9144990db8a43fddf17d7dac0a9c6b6391612cdb5bddf7a5938a441caa4d4e3ba1891bb4906d2b70a230d51e6c
+  metadata.gz: 3c6f1a464e2b81427cecb31ee26ed73ce8413635bc42156566b3927b214664ec3d862786880892102ecee5a94c10ce5e3c65d54d2ad85882d914dca603d0f58d
+  data.tar.gz: 57d24db630188ab12d0d23b3ec6aae112f94f79895b5092653f17d41f3352528d895cbe7ec227e7d014259a328f1aeb18cf978afbc8b9eb66cd39df6d477ddbb

data/README.md

@@ -91,7 +91,7 @@ In order to do that just run (with your own wallet ID, of course,
 and your own public IP address instead of `4.4.4.4`):
 
 ```bash
-$ zold --trace --verbose --invoice=5f96e731e48ae21f --host=4.4.4.4
+$ zold node --trace --verbose --invoice=5f96e731e48ae21f --host=4.4.4.4
 ```
 
 Then, open the page `4.4.4.4:4096` in your browser
@@ -102,7 +102,7 @@ Next, hit <kbd>Ctrl</kbd>+<kbd>c</kbd> and run it again, but instead
 of `zold` say `zold-nohup` and add an ampersand (`&`) at the end:
 
 ```bash
-$ zold-nohup --trace --verbose --invoice=5f96e731e48ae21f --host=4.4.4.4 &
+$ zold-nohup node --trace --verbose --invoice=5f96e731e48ae21f --host=4.4.4.4 &
 ```
 
 Now you can close console, it will work in the background, saving the

data/lib/zold/commands/merge.rb

@@ -50,8 +50,7 @@ Available options:"
       mine = @wallets.all if mine.empty?
       modified = []
       mine.each do |id|
-        wallet = @wallets.find(Id.new(id))
-        next unless merge(wallet, Copies.new(File.join(@copies, id)), opts)
+        next unless merge(Id.new(id), Copies.new(File.join(@copies, id)), opts)
         modified << Id.new(id)
         require_relative 'propagate'
         modified += Propagate.new(wallets: @wallets, log: @log).run(args)
@@ -61,8 +60,9 @@ Available options:"
 
     private
 
-    def merge(wallet, cps, _)
-      raise "There are no remote copies of #{wallet.id}, try FETCH first" if cps.all.empty?
+    def merge(id, cps, _)
+      raise "There are no remote copies of #{id}, try FETCH first" if cps.all.empty?
+      wallet = @wallets.find(id)
       cps = cps.all.sort_by { |c| c[:score] }.reverse
       patch = Patch.new
       main = Wallet.new(cps[0][:path])

data/lib/zold/node/entrance.rb

@@ -44,6 +44,7 @@ module Zold
       @address = address
       @log = log
       @semaphores = Concurrent::Map.new
+      @pool = Concurrent::FixedThreadPool.new(16)
     end
 
     def push(id, body, sync: true)
@@ -51,7 +52,7 @@ module Zold
       if sync
         push_sync(id, body)
       else
-        Thread.new do
+        @pool.post do
           push_sync(id, body)
         end
       end

data/lib/zold/version.rb

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

metadata

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