evt-consumer 2.2.0.0 → 2.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d005131cba1d68a95028facee2e86fb2936e29ae0fe296a746f4e0e25abfc910
-  data.tar.gz: caf16c231eb6195749b4b2190843ab87aed7735f4fd3b3da72555bab45f8ea76
+  metadata.gz: f5fba37af84ef2dfb56fda8f9a02664510d0fe78cd60294fdb0fb1ccbb6b599b
+  data.tar.gz: 75ee1350ef0c083527936e22dcea545af051d815d58a033e987188a974a3f02e
 SHA512:
-  metadata.gz: 332338327a4a4fc99a3010e1e62b0dd840d64914efba85d3f90a22a001df3215c43f49933b213ac6ae7bef78dfe2018b3cb6dcf051c40b42eb278e5d547dd0a8
-  data.tar.gz: 76e5105a629fbd97447d2423139b08ecf1d33a1cdb513bc662cacf3e4ec969888ee2b3da677fdc009583490f313d9067effac3e1c9087ee074ff9760d2bca24a
+  metadata.gz: c94763f577b956fafebd263bcf40cf82362a8010c1c026c96fc70e7072fc81d10c6443ba8b7bda872ac65f682f080a633387cfb1bdb882c64586825a4cd7e030
+  data.tar.gz: 42fa7d3fe8985a7bb808ab7eafa9883fa236cc2edb76c1bfe8da657f400390cc891970fb0f32b78d3553620e57bce2b46216723cc48776ede7131080f1b4f50f

data/lib/consumer/consumer.rb

@@ -33,10 +33,10 @@ module Consumer
         @position_update_counter ||= 0
       end
 
-      attr_accessor :session
-
       attr_accessor :poll_interval_milliseconds
 
+      attr_accessor :session
+
       dependency :get, MessageStore::Get
       dependency :position_store, PositionStore
       dependency :subscription, Subscription
@@ -49,34 +49,20 @@ module Consumer
     end
   end
 
-  def dispatch(message_data)
-    logger.trace { "Dispatching message (#{LogText.message_data(message_data)})" }
+  def start(&probe)
+    logger.info(tags: [:consumer, :start]) { "Starting consumer: #{self.class.name} (Category: #{category}, Identifier: #{identifier || '(none)'}, Position: #{subscription.position})" }
 
-    self.class.handler_registry.each do |handler|
-      handler.(message_data, session: session)
+    if Defaults.startup_info?
+      print_info
     end
 
-    update_position(message_data.global_position)
-
-    logger.info { "Message dispatched (#{LogText.message_data(message_data)})" }
-  rescue => error
-    logger.error { "Error raised (Error Class: #{error.class}, Error Message: #{error.message}, #{LogText.message_data(message_data)})" }
-    error_raised(error, message_data)
-  end
-
-  def start(&probe)
-    logger.info(tag: :*) { "Starting consumer: #{self.class.name} (Category: #{category}, Identifier: #{identifier || '(none)'}, Position: #{subscription.position})" }
+    log_info
+    starting if respond_to?(:starting)
 
     if not MessageStore::StreamName.category?(category)
       raise Error, "Consumer's stream name must be a category (Stream Name: #{category})"
     end
 
-    starting() if respond_to?(:starting)
-
-    self.class.handler_registry.each do |handler|
-      logger.info(tag: :*) { "Handler: #{handler.name} (Category: #{category}, Consumer: #{self.class.name})" }
-    end
-
     _, subscription_thread = ::Actor::Start.(subscription)
 
     actor_address, actor_thread = Actor.start(self, subscription, include: :thread)
@@ -87,24 +73,76 @@ module Consumer
       probe.(self, [actor_thread, subscription_thread], [actor_address, subscription_address])
     end
 
-    logger.info(tag: :*) { "Started consumer: #{self.class.name} (Category: #{category}, Identifier: #{identifier || '(none)'}, Position: #{subscription.position})" }
+    logger.info(tags: [:consumer, :start]) { "Started consumer: #{self.class.name} (Category: #{category}, Identifier: #{identifier || '(none)'}, Position: #{subscription.position})" }
 
     AsyncInvocation::Incorrect
   end
 
+  def print_info
+    STDOUT.puts
+    STDOUT.puts "    Consumer: #{self.class.name}"
+    STDOUT.puts "      Category: #{category}"
+    STDOUT.puts "      Position: #{subscription.position}"
+    STDOUT.puts "      Identifier: #{identifier || '(none)'}"
+
+    print_startup_info if respond_to?(:print_startup_info)
+
+    STDOUT.puts "      Position Stream: #{position_store.stream_name}"
+
+    STDOUT.puts
+
+    STDOUT.puts "      Handlers:"
+    self.class.handler_registry.each do |handler|
+      STDOUT.puts "        Handler: #{handler.name}"
+      STDOUT.puts "          Messages: #{handler.message_registry.message_types.join(', ')}"
+    end
+  end
+
+  def log_info
+    logger.info(tags: [:consumer, :start]) { "Category: #{category} (Consumer: #{self.class.name})" }
+    logger.info(tags: [:consumer, :start]) { "Position: #{subscription.position} (Consumer: #{self.class.name})" }
+    logger.info(tags: [:consumer, :start]) { "Identifier: #{identifier || 'nil'} (Consumer: #{self.class.name})" }
+
+    log_startup_info if respond_to?(:log_startup_info)
+
+    logger.info(tags: [:consumer, :start]) { "Position Update Interval: #{position_update_interval.inspect} (Consumer: #{self.class.name})" }
+
+    logger.info(tags: [:consumer, :start]) { "Poll Interval Milliseconds: #{poll_interval_milliseconds.inspect} (Consumer: #{self.class.name})" }
+
+    self.class.handler_registry.each do |handler|
+      logger.info(tags: [:consumer, :start]) { "Handler: #{handler.name} (Consumer: #{self.class.name})" }
+      logger.info(tags: [:consumer, :start]) { "Messages: #{handler.message_registry.message_types.join(', ')} (Handler: #{handler.name}, Consumer: #{self.class.name})" }
+    end
+  end
+
+  def dispatch(message_data)
+    logger.trace(tags: [:consumer, :dispatch, :message]) { "Dispatching message (#{LogText.message_data(message_data)})" }
+
+    self.class.handler_registry.each do |handler|
+      handler.(message_data, session: session)
+    end
+
+    update_position(message_data.global_position)
+
+    logger.debug(tags: [:consumer, :dispatch, :message]) { "Message dispatched (#{LogText.message_data(message_data)})" }
+  rescue => error
+    logger.error(tag: :*) { "Error raised (Error Class: #{error.class}, Error Message: #{error.message}, #{LogText.message_data(message_data)})" }
+    error_raised(error, message_data)
+  end
+
   def update_position(position)
-    logger.trace { "Updating position (Global Position: #{position}, Counter: #{position_update_counter}/#{position_update_interval})" }
+    logger.trace(tags: [:consumer, :position]) { "Updating position (Global Position: #{position}, Counter: #{position_update_counter}/#{position_update_interval})" }
 
     self.position_update_counter += 1
 
     if position_update_counter >= position_update_interval
       position_store.put(position)
 
-      logger.debug { "Updated position (Global Position: #{position}, Counter: #{position_update_counter}/#{position_update_interval})" }
+      logger.debug(tags: [:consumer, :position]) { "Updated position (Global Position: #{position}, Counter: #{position_update_counter}/#{position_update_interval})" }
 
       self.position_update_counter = 0
     else
-      logger.debug { "Interval not reached; position not updated (Global Position: #{position}, Counter: #{position_update_counter}/#{position_update_interval})" }
+      logger.debug(tags: [:consumer, :position]) { "Interval not reached; position not updated (Global Position: #{position}, Counter: #{position_update_counter}/#{position_update_interval})" }
     end
   end
 
@@ -116,7 +154,7 @@ module Consumer
 
   module Configure
     def configure(**kwargs)
-      logger.trace { "Configuring (Category: #{category})" }
+      logger.trace(tag: :consumer) { "Configuring (Category: #{category})" }
 
       super(**kwargs)
 
@@ -129,7 +167,7 @@ module Consumer
         poll_interval_milliseconds: poll_interval_milliseconds
       )
 
-      logger.debug { "Done configuring (Category: #{category}, Starting Position: #{starting_position})" }
+      logger.debug(tag: :consumer) { "Done configuring (Category: #{category}, Starting Position: #{starting_position})" }
     end
   end
 
@@ -185,4 +223,24 @@ module Consumer
       end
     end
   end
+
+  module Defaults
+    def self.startup_info?
+      StartupInfo.get == 'on'
+    end
+
+    module StartupInfo
+      def self.get
+        ENV.fetch(env_var, default)
+      end
+
+      def self.env_var
+        'STARTUP_INFO'
+      end
+
+      def self.default
+        'on'
+      end
+    end
+  end
 end

data/lib/consumer/controls/position_store.rb

@@ -10,6 +10,10 @@ module Consumer
 
         attr_accessor :telemetry_sink
 
+        def stream_name
+          'somePositionStream'
+        end
+
         def self.build
           instance = new
           instance.configure

data/lib/consumer/position_store.rb

@@ -60,7 +60,7 @@ module Consumer
 
         position = super
 
-        logger.info(tags: [:position_store, :get]) { "Get position done (Position: #{position || '(none)'})" }
+        logger.debug(tags: [:position_store, :get]) { "Get position done (Position: #{position || '(none)'})" }
 
         telemetry.record(:get, Telemetry::Get.new(position))
 

data/lib/consumer/postgres

@@ -0,0 +1 @@
+lib/consumer/Users/sbellware/projects/eventide/consumer-postgres/lib/consumer/postgres

data/lib/consumer/postgres.rb

@@ -0,0 +1 @@
+lib/consumer/Users/sbellware/projects/eventide/consumer-postgres/lib/consumer/postgres.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer
 version: !ruby/object:Gem::Version
-  version: 2.2.0.0
+  version: 2.2.0.1
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ntl-actor
@@ -132,6 +132,8 @@ files:
 - lib/consumer/position_store.rb
 - lib/consumer/position_store/substitute.rb
 - lib/consumer/position_store/telemetry.rb
+- lib/consumer/postgres
+- lib/consumer/postgres.rb
 - lib/consumer/subscription.rb
 - lib/consumer/subscription/defaults.rb
 - lib/consumer/subscription/get_batch.rb
@@ -155,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Continuous subscription to a category and message dispatching to handlers