zold 0.13.37 → 0.13.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18501efcccce708ef86d74d1833aa65049cc9af
-  data.tar.gz: 305c19eecc8df966e70ca0d1dd487988a4e7fe40
+  metadata.gz: e1c4b9fec37b2f1f351188890814381b2abbaa48
+  data.tar.gz: c3d35c7bcf49845a0f95a0a24fee896bf4fbef3f
 SHA512:
-  metadata.gz: 4d3b807fdc1db274a26d31a9cba3c42b2ac888bd1de0d079f2dc9554ebdb4d3fa0fd245ce6a914a5fd4856aeeeb95ac384365555279ea80a746cab31f193fbd4
-  data.tar.gz: c9e3c8e1e5dfa5b7c976b0ef74af1d68bdf9b367a8236615a616e23308d370b3bb2f75b019172a3b1ed033e9df327b056701968c95f38d6e92eb4dd41d1a44bc
+  metadata.gz: c3d5840ae8b755c85ceffbc5d0bfab5c778bc42d8a6f9883f1c178d7d86136206d07707425a33ecc55f2f823f850edc834fb8c9175eccab2ba8400c177acadb8
+  data.tar.gz: bebb092830df7d63e311b861804ab2013b6e43341a77e0ed9d96b5ee2438bc405797e30d06dbe831a46c52ae8a7f14e454040094e6d74c927ee667d5418eeaae

data/lib/zold/remotes.rb

@@ -110,6 +110,7 @@ module Zold
       @file = file
       raise 'Network can\'t be nil' if network.nil?
       @network = network
+      @mutex = Mutex.new
     end
 
     def all
@@ -223,31 +224,35 @@ in #{(Time.now - start).round}s; errors=#{errors}")
     private
 
     def load
-      raw = CSV.read(file).map do |r|
-        {
-          host: r[0],
-          port: r[1].to_i,
-          score: r[2].to_i,
-          errors: r[3].to_i
-        }
-      end
-      raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
-        r[:home] = URI("http://#{r[0]}:#{r[1]}/")
-        r
+      @mutex.synchronize do
+        raw = CSV.read(file).map do |r|
+          {
+            host: r[0],
+            port: r[1].to_i,
+            score: r[2].to_i,
+            errors: r[3].to_i
+          }
+        end
+        raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
+          r[:home] = URI("http://#{r[0]}:#{r[1]}/")
+          r
+        end
       end
     end
 
     def save(list)
-      AtomicFile.new(file).write(
-        list.map do |r|
-          [
-            r[:host],
-            r[:port],
-            r[:score],
-            r[:errors]
-          ].join(',')
-        end.join("\n")
-      )
+      @mutex.synchronize do
+        AtomicFile.new(file).write(
+          list.map do |r|
+            [
+              r[:host],
+              r[:port],
+              r[:score],
+              r[:errors]
+            ].join(',')
+          end.join("\n")
+        )
+      end
     end
 
     def file

data/lib/zold/version.rb

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

data/test/test_remotes.rb

@@ -20,9 +20,12 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
+require 'concurrent'
+require 'concurrent/atomics'
 require_relative 'test__helper'
 require_relative '../lib/zold/log'
 require_relative '../lib/zold/remotes'
+require_relative '../lib/zold/verbose_thread'
 
 # Remotes test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -122,4 +125,35 @@ class TestRemotes < Minitest::Test
       end
     end
   end
+
+  def test_modifies_from_many_threads
+    Dir.mktmpdir 'test' do |dir|
+      remotes = Zold::Remotes.new(File.join(dir, 'a.csv'))
+      remotes.clean
+      threads = 5
+      pool = Concurrent::FixedThreadPool.new(threads)
+      alive = true
+      cycles = Concurrent::AtomicFixnum.new
+      success = Concurrent::AtomicFixnum.new
+      host = '192.168.0.1'
+      remotes.add(host)
+      threads.times do
+        pool.post do
+          while alive
+            Zold::VerboseThread.new(test_log).run(true) do
+              cycles.increment
+              remotes.error(host)
+              success.increment
+            end
+          end
+        end
+      end
+      sleep 0.1 while cycles.value < 50
+      alive = false
+      pool.shutdown
+      pool.wait_for_termination
+      assert_equal(cycles.value, success.value)
+      assert_equal(0, remotes.all.reject { |r| r[:host] == host }.size)
+    end
+  end
 end

metadata

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