zold 0.13.33 → 0.13.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7fc6c26e23e3a3d056b786a847f4ea01b4f8763
-  data.tar.gz: f43869756f2b8eb4a7d63e22c6392ee297483246
+  metadata.gz: b72e9cbc1d475ad37e79d6f26dd0826702162b0a
+  data.tar.gz: 1a423d084caf176481696a30e800c30910681775
 SHA512:
-  metadata.gz: 896be48716e75a94ff60de18c026ca36eeba4a558d2fbad47a7aa934dab4543724d23df676e778a20f28c19a2aa93a8504a1a099832f04013626adc4f3568534
-  data.tar.gz: 34aed103cece3a518ea2d9d17a8f5c03e2ee7ba495341a0e8a50ae85c32115a3717811eba5118661d6e35424032736f7a0f26f37e7fdd2f25a80fe93a28332a3
+  metadata.gz: 017c6255d34f34f137acfb403a8e9123aba9442579b0824d50c63ab45f4aa739e120a629d1f39c72386e644c0b3861476a013acd851738e62f18a26c3c77f435
+  data.tar.gz: 8dd19ab2329b2c78abbe39ffb9f06e8d2cc0d37b2b675887627970368082137f2cdd9438dbfa3707321ad593d54688796fbf86d95b6ab223484f825eb7ac40bd

data/fixtures/scripts/redeploy-on-upgrade.sh

@@ -20,7 +20,7 @@ low=$(reserve_port)
 secondary=$(start_node ${low} 1.1.1)
 zold remote add localhost ${high} --home=${low}
 
-trap "kill -9 ${primary}; kill -9 ${secondary}" EXIT
+trap "kill -9 ${primary} ${secondary}" EXIT
 
 wait_for_file ${low}/restarted
 

data/lib/zold/commands/node.rb

@@ -157,14 +157,11 @@ module Zold
       farm = Farm.new(invoice, File.join(Dir.pwd, 'farm'), log: @log)
       farm.start(host, opts[:port], threads: opts[:threads], strength: opts[:strength]) do
         Front.set(:farm, farm)
-        metronome = metronome(farm, entrance, opts)
-        Front.set(:metronome, metronome)
-        begin
+        metronome(farm, entrance, opts).start do |metronome|
+          Front.set(:metronome, metronome)
           @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
           Front.run!
           @log.info("The web front stopped at http://#{host}:#{opts[:port]}")
-        ensure
-          metronome.stop
         end
       end
     end

data/lib/zold/metronome.rb

@@ -20,6 +20,7 @@
 
 require_relative 'log'
 require_relative 'verbose_thread'
+require_relative 'backtrace'
 
 # Background routines.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -30,33 +31,50 @@ module Zold
   class Metronome
     def initialize(log = Log::Quiet.new)
       @log = log
+      @routines = []
       @threads = []
+      @failures = {}
     end
 
     def to_text
       @threads.map do |t|
         "#{t.name}: status=#{t.status}; alive=#{t.alive?};\n  #{t.backtrace.join("\n  ")}"
-      end.join("\n")
+      end.join("\n") + "\n\n" + @failures.map { |r, f| "#{r}\n#{f}\n" }.join("\n")
     end
 
     def add(routine)
-      @threads << Thread.start do
-        Thread.current.name = routine.class.name
-        step = 0
-        loop do
-          start = Time.now
-          VerboseThread.new(@log).run(true) do
-            routine.exec(step)
-          end
-          step += 1
-          @log.info("Routine #{routine.class.name} ##{step} done in #{(Time.now - start).round(2)}s: \
+      @routines << routine
+      @log.info("Added #{routine.class.name} to the metronome")
+    end
+
+    def start
+      @routines.each do |r|
+        @threads << Thread.start do
+          Thread.current.name = r.class.name
+          step = 0
+          loop do
+            start = Time.now
+            begin
+              r.exec(step)
+            rescue StandardError => e
+              @failures[r.class.name] = Backtrace.new(e).to_s
+            end
+            step += 1
+            @log.info("Routine #{r.class.name} ##{step} done in #{(Time.now - start).round(2)}s: \
 #{@threads.map { |t| "#{t.name}/#{t.status}" }.join(',')}")
-          sleep(1)
+            sleep(1)
+          end
         end
       end
-      @log.info("Added #{routine.class.name} to the metronome")
+      begin
+        yield(self)
+      ensure
+        stop
+      end
     end
 
+    private
+
     def stop
       @log.info("Terminating the metronome with #{@threads.count} threads...")
       start = Time.now
@@ -65,7 +83,7 @@ module Zold
         t.exit
         @log.info("Thread #{t.name} terminated in #{(Time.now - tstart).round(2)}s")
       end
-      @log.info("Metronome stopped in #{(Time.now - start).round(2)}s")
+      @log.info("Metronome stopped in #{(Time.now - start).round(2)}s, #{@failures.count} failures")
     end
   end
 end

data/lib/zold/version.rb

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

data/test/node/fake_node.rb

@@ -30,6 +30,10 @@ require_relative '../../lib/zold/verbose_thread'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class FakeNode
+  # rubocop:disable Style/ClassVars
+  @@ports = Set.new
+  # rubocop:enable Style/ClassVars
+
   def initialize(log: Zold::Log::Quiet.new)
     @log = log
   end
@@ -70,4 +74,15 @@ class FakeNode
       end
     end
   end
+
+  def self.port
+    loop do
+      server = TCPServer.new('127.0.0.1', 0)
+      port = server.addr[1]
+      server.close
+      next if @@ports.include?(port)
+      @@ports << port
+      port
+    end
+  end
 end

data/test/test_metronome.rb

@@ -31,18 +31,28 @@ class TestMetronome < Minitest::Test
     metronome = Zold::Metronome.new(test_log)
     list = []
     metronome.add(FakeRoutine.new(list))
-    sleep 0.1 while list.empty?
-    metronome.stop
-    assert_equal(1, list.count)
+    metronome.start do
+      sleep 0.1 while list.empty?
+      assert_equal(1, list.count)
+    end
+  end
+
+  def test_prints_to_text
+    metronome = Zold::Metronome.new(test_log)
+    metronome.add(FakeRoutine.new([]))
+    metronome.start do |m|
+      assert(!m.to_text.nil?)
+    end
   end
 
   def test_continues_even_after_error
     metronome = Zold::Metronome.new(test_log)
     routine = BrokenRoutine.new
     metronome.add(routine)
-    sleep 0.1 while routine.count < 2
-    metronome.stop
-    assert(routine.count > 1)
+    metronome.start do
+      sleep 0.1 while routine.count < 2
+      assert(routine.count > 1)
+    end
   end
 
   class FakeRoutine

metadata

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