artery 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a24ddb4d77a16718ba5a3f736d54decefc74e698d2d5dad2564450845e4848c
-  data.tar.gz: eb438118c9b36740988e7c17d00a8c242b6bd836cbe0204a81bf923ed3ab42f5
+  metadata.gz: 66026b7e5dd81edcbb4fc03956531d781f06387846c23cc6a88c7047da24000d
+  data.tar.gz: 8177b56b29b22a7c09324c4d5a8915b9c697a73aba69f937d4870f1664a0dcb2
 SHA512:
-  metadata.gz: fb73eef213f1316758158ff5282c854fcc9b1dd602281921933ecc3c8fa4c9d79f4a1a731a7f2e26581fff789425e8e7b0dd96a5bb82a00fd734e21415fc3b39
-  data.tar.gz: 9b62f659e797ab808df25ed4c719d94a9d0c0f3ef80d445f432fbe810bba6901d6c7cfe4fea4d58584de5f0d6d836919ee46b52cff7c2a559fb2d7ff4dbd4bef
+  metadata.gz: e33b8a5fafbf2f56651a85b43636ad62ad68a4e34c219979a171cdf2dcdef1b68372ff17f4f07be256ea1524f5a5b3d999cd8685687ecfdc4eb4afbf7143f40d
+  data.tar.gz: 39b1c29831cef207fabf34c0c52d8889c4695c0a99ea81f13565538c65a733f4d3aa19cdf5625e4d67a5ef549c02ce3999b19893b696afb5bd5d6493bc4b0ffa

data/lib/artery/publisher.rb

@@ -4,7 +4,7 @@ require 'concurrent'
 
 module Artery
   class Publisher
-    DISCOVERY_INTERVAL = 5
+    DISCOVERY_INTERVAL = 30
     POLL_INTERVAL = 0.5
     BATCH_SIZE = 100
 
@@ -27,44 +27,64 @@ module Artery
         max_queue: 0,
         fallback_policy: :caller_runs
       )
-      @running_models = Concurrent::Set.new
+      @known_models = Concurrent::Set.new
+      @busy_models = Concurrent::Set.new
+      @last_discovery = Time.at(0)
 
       Instrumentation.instrument(:publisher, action: :started)
 
       loop do
-        models = Artery.model_info_class.pluck(:model)
+        discover_models if discovery_due?
 
-        models.each do |model|
-          next if @running_models.include?(model)
+        @known_models.each do |model|
+          next if @busy_models.include?(model)
 
-          @running_models.add(model)
-          @pool.post { model_loop(model) }
+          @busy_models.add(model)
+          @pool.post { process_model(model) }
         end
 
-        sleep DISCOVERY_INTERVAL
+        sleep POLL_INTERVAL
       end
     end
 
-    def model_loop(model)
-      Artery.logger.tagged('Publisher', model) do
+    def discover_models
+      current = Artery.model_info_class.pluck(:model)
+
+      (@known_models - current).each do |removed|
+        @known_models.delete(removed)
+        Instrumentation.instrument(:publisher, action: :model_removed, model: removed)
+      end
+
+      current.each do |model|
+        next if @known_models.include?(model)
+
+        @known_models.add(model)
         Artery.model_info_class.ensure_initialized!(model)
         Instrumentation.instrument(:publisher, action: :model_started, model: model)
+      end
 
+      @last_discovery = Time.now
+    end
+
+    def discovery_due?
+      Time.now - @last_discovery >= DISCOVERY_INTERVAL
+    end
+
+    def process_model(model)
+      Artery.logger.tagged('Publisher', model) do
         loop do
           published = publish_batch(model)
-          sleep POLL_INTERVAL if published < BATCH_SIZE
+          break if published < BATCH_SIZE
         end
-      rescue StandardError => e
-        Instrumentation.instrument(:publisher, action: :error, model: model, error: e.message)
-        Artery.handle_error Error.new(
-          "Publisher error for #{model}: #{e.message}",
-          original_exception: e
-        )
-        sleep POLL_INTERVAL
-        retry
       end
+    rescue StandardError => e
+      Instrumentation.instrument(:publisher, action: :error, model: model, error: e.message)
+      Artery.handle_error Error.new(
+        "Publisher error for #{model}: #{e.message}",
+        original_exception: e
+      )
     ensure
-      @running_models.delete(model)
+      @busy_models&.delete(model)
     end
 
     def publish_batch(model)

data/lib/artery/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Artery
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artery
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Sergey Gnuskov