eventhub-processor2 1.8.0 → 1.9.0

data/lib/eventhub/constant.rb

@@ -1,35 +1,35 @@
 module EventHub
-  EH_X_INBOUND             = 'event_hub.inbound'
+  EH_X_INBOUND = "event_hub.inbound"
 
-  STATUS_INITIAL           = 0         # To be set when dispatcher needs to dispatch to first process step.
+  STATUS_INITIAL = 0 # To be set when dispatcher needs to dispatch to first process step.
 
-  STATUS_SUCCESS           = 200       # To be set to indicate successful processed message. Dispatcher will routes message to the next step.
+  STATUS_SUCCESS = 200 # To be set to indicate successful processed message. Dispatcher will routes message to the next step.
 
-  STATUS_RETRY             = 300       # To be set to trigger retry cycle controlled by the dispatcher
-  STATUS_RETRY_PENDING     = 301       # Set and used by the dispatcher only.
-                                       # Set before putting the message into a retry queue.
-                                       # Once message has been retried it will sent do the same step with status.code = STATUS_SUCCESS
+  STATUS_RETRY = 300 # To be set to trigger retry cycle controlled by the dispatcher
+  STATUS_RETRY_PENDING = 301 # Set and used by the dispatcher only.
+  # Set before putting the message into a retry queue.
+  # Once message has been retried it will sent do the same step with status.code = STATUS_SUCCESS
 
-  STATUS_INVALID           = 400       # To be set to indicate invalid message (not json, invalid Event Hub Message).
-                                       # Dispatcher will publish message to the invalid queue.
+  STATUS_INVALID = 400 # To be set to indicate invalid message (not json, invalid Event Hub Message).
+  # Dispatcher will publish message to the invalid queue.
 
-  STATUS_DEADLETTER        = 500       # To be set by dispatcher, processor or channel adapters to indicate
-                                       # that message needs to be dead-lettered. Rejected messages could miss the
-                                       # status.code = STATUS_DEADLETTER due to the RabbitMQ deadletter exchange mechanism.
+  STATUS_DEADLETTER = 500 # To be set by dispatcher, processor or channel adapters to indicate
+  # that message needs to be dead-lettered. Rejected messages could miss the
+  # status.code = STATUS_DEADLETTER due to the RabbitMQ deadletter exchange mechanism.
 
-  STATUS_SCHEDULE          = 600       # To be set to trigger scheduler based on schedule block, proceses next process step
-  STATUS_SCHEDULE_RETRY    = 601       # To be set to trigger scheduler based on schedule block, retry actual process step
-  STATUS_SCHEDULE_PENDING  = 602       # Set and used by the dispatcher only. Set before putting the scheduled message to the schedule queue.
+  STATUS_SCHEDULE = 600 # To be set to trigger scheduler based on schedule block, proceses next process step
+  STATUS_SCHEDULE_RETRY = 601 # To be set to trigger scheduler based on schedule block, retry actual process step
+  STATUS_SCHEDULE_PENDING = 602 # Set and used by the dispatcher only. Set before putting the scheduled message to the schedule queue.
 
   STATUS_CODE_TRANSLATION = {
-    STATUS_INITIAL => 'STATUS_INITIAL',
-    STATUS_SUCCESS => 'STATUS_SUCCESS',
-    STATUS_RETRY => 'STATUS_RETRY',
-    STATUS_RETRY_PENDING => 'STATUS_RETRY_PENDING',
-    STATUS_INVALID => 'STATUS_INVALID',
-    STATUS_DEADLETTER => 'STATUS_DEADLETTER',
-    STATUS_SCHEDULE => 'STATUS_SCHEDULE',
-    STATUS_SCHEDULE_RETRY => 'STATUS_SCHEDULE_RETRY',
-    STATUS_SCHEDULE_PENDING =>'STATUS_SCHEDULE_PENDING',
+    STATUS_INITIAL => "STATUS_INITIAL",
+    STATUS_SUCCESS => "STATUS_SUCCESS",
+    STATUS_RETRY => "STATUS_RETRY",
+    STATUS_RETRY_PENDING => "STATUS_RETRY_PENDING",
+    STATUS_INVALID => "STATUS_INVALID",
+    STATUS_DEADLETTER => "STATUS_DEADLETTER",
+    STATUS_SCHEDULE => "STATUS_SCHEDULE",
+    STATUS_SCHEDULE_RETRY => "STATUS_SCHEDULE_RETRY",
+    STATUS_SCHEDULE_PENDING => "STATUS_SCHEDULE_PENDING"
   }
 end

data/lib/eventhub/hash_extensions.rb

@@ -10,18 +10,18 @@ module HashExtensions
     # e.g. hash.get(%w(event_hub plate.queue1 retry_s))
     # "a" => { "b" => { "c" => { "value"}}}
     def get(arg)
-      path = arg.is_a?(String) ? arg.split('.') : arg
+      path = arg.is_a?(String) ? arg.split(".") : arg
       path.inject(self, :[])
     end
 
     # set value from provided key path, e.h. hash.set('a.b.c','new value')
     # if overwrite is false, value will be set if it was nil previously
     def set(arg, value, overwrite = true)
-      *key_path, last = arg.is_a?(String) ? arg.split('.') : arg
+      *key_path, last = arg.is_a?(String) ? arg.split(".") : arg
       if overwrite
-        key_path.inject(self) { |h, key| h.key?(key) ? h[key] :  h[key] = {} } [last] = value
+        key_path.inject(self) { |h, key| h.key?(key) ? h[key] : h[key] = {} } [last] = value
       else
-        key_path.inject(self) { |h, key| h.key?(key) ? h[key] :  h[key] = {} } [last] ||= value
+        key_path.inject(self) { |h, key| h.key?(key) ? h[key] : h[key] = {} } [last] ||= value
       end
     end
 
@@ -30,10 +30,10 @@ module HashExtensions
     def all_keys_with_path(parent = nil)
       a = []
       each do |k, v|
-        if v.is_a?(Hash)
-          a << v.all_keys_with_path([parent, k].compact.join('.'))
+        a << if v.is_a?(Hash)
+          v.all_keys_with_path([parent, k].compact.join("."))
         else
-          a << [parent, k].compact.join('.').to_s
+          [parent, k].compact.join(".").to_s
         end
       end
       a.flatten
@@ -41,7 +41,7 @@ module HashExtensions
   end
 
   def self.included(receiver)
-    receiver.extend         ClassMethods
+    receiver.extend ClassMethods
     receiver.send :include, InstanceMethods
   end
 end

data/lib/eventhub/helper.rb

@@ -11,16 +11,16 @@ module EventHub
     # EventHub::NameSpace::DemoProcessor => name_space.demo_processor
     # NameSpace::Demo => name_space.demo
     def get_name_from_class(instance)
-      instance.class.to_s.split('::').map do |element|
-        next if element == 'EventHub'
-        element.split(/(?=[A-Z])/).join('_').downcase
-      end.compact.join('.')
+      instance.class.to_s.split("::").map { |element|
+        next if element == "EventHub"
+        element.split(/(?=[A-Z])/).join("_").downcase
+      }.compact.join(".")
     end
 
     def create_bunny_connection
       server = EventHub::Configuration.server
 
-      protocol = 'amqp'
+      protocol = "amqp"
       connection_properties = {}
       connection_properties[:user] = server[:user]
       connection_properties[:pass] = server[:password]
@@ -28,7 +28,7 @@ module EventHub
 
       # inject bunny logs on request
       unless server[:show_bunny_logs]
-        connection_properties[:logger] = Logger.new('/dev/null')
+        connection_properties[:logger] = Logger.new("/dev/null")
       end
 
       # we don't need it since reactors can deal with it
@@ -50,7 +50,7 @@ module EventHub
     end
 
     # Formats stamp into UTC format
-    def now_stamp(now=nil)
+    def now_stamp(now = nil)
       now ||= Time.now
       now.utc.strftime("%Y-%m-%dT%H:%M:%S.%6NZ")
     end

data/lib/eventhub/logger.rb

@@ -3,10 +3,10 @@ module EventHub
   def self.logger
     unless @logger
       @logger = ::EventHub::Components::MultiLogger.new
-      @logger.add_device(Logger.new(STDOUT))
+      @logger.add_device(Logger.new($stdout))
       @logger.add_device(
         EventHub::Components::Logger.logstash(Configuration.name,
-                                              Configuration.environment)
+          Configuration.environment)
       )
     end
     @logger

data/lib/eventhub/message.rb

@@ -4,29 +4,29 @@ module EventHub
   class Message
     include Helper
 
-    VERSION = '1.0.0'.freeze
+    VERSION = "1.0.0".freeze
 
     # Headers that are required (value can be nil) in order to pass valid?
     REQUIRED_HEADERS = [
-      'message_id',
-      'version',
-      'created_at',
-      'origin.module_id',
-      'origin.type',
-      'origin.site_id',
-      'process.name',
-      'process.step_position',
-      'process.execution_id',
-      'status.retried_count',
-      'status.code',
-      'status.message'
+      "message_id",
+      "version",
+      "created_at",
+      "origin.module_id",
+      "origin.type",
+      "origin.site_id",
+      "process.name",
+      "process.step_position",
+      "process.execution_id",
+      "status.retried_count",
+      "status.code",
+      "status.message"
     ].freeze
 
     attr_accessor :header, :body, :raw, :vhost, :routing_key
 
     # Build accessors for all required headers
     REQUIRED_HEADERS.each do |header|
-      name = header.tr('.', '_')
+      name = header.tr(".", "_")
 
       define_method(name) do
         self.header.get(header)
@@ -39,18 +39,18 @@ module EventHub
 
     def self.from_json(raw)
       data = JSON.parse(raw)
-      Message.new(data.get('header'), data.get('body'), raw)
+      Message.new(data.get("header"), data.get("body"), raw)
     rescue => e
       Message.new(
         {
-          'status' =>
+          "status" =>
           {
-            'code' => STATUS_INVALID,
-            'message' => "JSON parse error: #{e}"
+            "code" => STATUS_INVALID,
+            "message" => "JSON parse error: #{e}"
           }
         },
         {
-          'original_message_base64_encoded' => Base64.encode64(raw)
+          "original_message_base64_encoded" => Base64.encode64(raw)
         },
         raw
       )
@@ -58,33 +58,33 @@ module EventHub
 
     def initialize(header = nil, body = nil, raw = nil)
       @header = header || {}
-      @body   = body || {}
-      @raw    = raw
+      @body = body || {}
+      @raw = raw
 
       # set message defaults, that we have required headers
-      @header.set('message_id', UUIDTools::UUID.timestamp_create.to_s, false)
-      @header.set('version', VERSION, false)
-      @header.set('created_at', now_stamp, false)
+      @header.set("message_id", UUIDTools::UUID.timestamp_create.to_s, false)
+      @header.set("version", VERSION, false)
+      @header.set("created_at", now_stamp, false)
 
-      @header.set('origin.module_id', 'undefined', false)
-      @header.set('origin.type', 'undefined', false)
-      @header.set('origin.site_id', 'undefined', false)
+      @header.set("origin.module_id", "undefined", false)
+      @header.set("origin.type", "undefined", false)
+      @header.set("origin.site_id", "undefined", false)
 
-      @header.set('process.name', 'undefined', false)
-      @header.set('process.execution_id',
-                  UUIDTools::UUID.timestamp_create.to_s, false)
-      @header.set('process.step_position', 0, false)
+      @header.set("process.name", "undefined", false)
+      @header.set("process.execution_id",
+        UUIDTools::UUID.timestamp_create.to_s, false)
+      @header.set("process.step_position", 0, false)
 
-      @header.set('status.retried_count', 0, false)
-      @header.set('status.code', STATUS_INITIAL, false)
-      @header.set('status.message', '', false)
+      @header.set("status.retried_count", 0, false)
+      @header.set("status.code", STATUS_INITIAL, false)
+      @header.set("status.message", "", false)
     end
 
     def valid?
       # check for existence and defined value
       REQUIRED_HEADERS.all? do |key|
         @header.all_keys_with_path.include?(key) &&
-          !send(key.tr('.', '_').to_sym).nil?
+          !send(key.tr(".", "_").to_sym).nil?
       end
     end
 
@@ -121,11 +121,11 @@ module EventHub
     end
 
     def to_json
-      { 'header' => header, 'body' => body }.to_json
+      {"header" => header, "body" => body}.to_json
     end
 
     def to_s
-      'Msg: process '\
+      "Msg: process "\
         "[#{process_name}, #{process_step_position}, #{process_execution_id}]"\
         ", status [#{status_code},#{status_message},#{status_retried_count}]"
     end
@@ -135,20 +135,20 @@ module EventHub
     def copy(status_code = STATUS_SUCCESS)
       # use Marshal dump and load to make a deep object copy
       copied_header = Marshal.load(Marshal.dump(header))
-      copied_body   = Marshal.load(Marshal.dump(body))
+      copied_body = Marshal.load(Marshal.dump(body))
 
-      copied_header.set('message_id', UUIDTools::UUID.timestamp_create.to_s)
-      copied_header.set('created_at', now_stamp)
-      copied_header.set('status.code', status_code)
+      copied_header.set("message_id", UUIDTools::UUID.timestamp_create.to_s)
+      copied_header.set("created_at", now_stamp)
+      copied_header.set("status.code", status_code)
 
       Message.new(copied_header, copied_body)
     end
 
     def append_to_execution_history(processor_name)
-      header.set('execution_history', []) unless \
-        header.get('execution_history')
-      header.get('execution_history') << \
-        { 'processor' => processor_name, 'timestamp' => now_stamp }
+      header.set("execution_history", []) unless \
+        header.get("execution_history")
+      header.get("execution_history") << \
+        {"processor" => processor_name, "timestamp" => now_stamp}
     end
 
     def self.translate_status_code(code)

data/lib/eventhub/processor2.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require_relative "base"
 
 # EventHub module
 module EventHub
@@ -15,7 +15,7 @@ module EventHub
     def initialize(args = {})
       # Set processor name
       EventHub::Configuration.name = args[:name] ||
-                                     get_name_from_class(self)
+        get_name_from_class(self)
 
       # Parse comand line options
       EventHub::Configuration.parse_options
@@ -54,7 +54,7 @@ module EventHub
     # get message as EventHub::Message class instance
     # args contain :queue_name, :content_type, :priority, :delivery_tag
     def handle_message(_message, _args = {})
-      raise 'need to be implemented in derived class'
+      raise "need to be implemented in derived class"
     end
 
     # pass message as string like: '{ "header": ... , "body": { .. }}'
@@ -86,8 +86,8 @@ module EventHub
 
     def start_supervisor
       @config = Celluloid::Supervision::Configuration.define([
-        {type: ActorHeartbeat, as: :actor_heartbeat, args: [ self ]},
-        {type: ActorListener, as: :actor_listener, args: [ self ]}
+        {type: ActorHeartbeat, as: :actor_heartbeat, args: [self]},
+        {type: ActorListener, as: :actor_listener, args: [self]}
       ])
 
       sleeper = @sleeper
@@ -95,34 +95,34 @@ module EventHub
         restart_in_s = Configuration.processor[:restart_in_s]
         EventHub.logger.info("Restarting in #{restart_in_s} seconds...")
         sleeper.start(restart_in_s)
-      end )
+      end)
 
       @config.deploy
     end
 
     def main_event_loop
+      Celluloid.boot
       setup_signal_handler
       start_supervisor
 
       loop do
         command = @command_queue.pop
-        case
-          when SIGNALS_FOR_TERMINATION.include?(command)
-            EventHub.logger.info("Command [#{command}] received")
-            @sleeper.stop
-            break
-          when SIGNALS_FOR_RELOAD_CONFIG.include?(command)
-            EventHub::Configuration.load!
-            EventHub.logger.info('Configuration file reloaded')
-
-            # restart listener when actor is known
-            if Celluloid::Actor[:actor_listener]
-              Celluloid::Actor[:actor_listener].async.restart
-            else
-              EventHub.logger.info('Was unable to get a valid listener actor to restart... check!!!')
-            end
+        if SIGNALS_FOR_TERMINATION.include?(command)
+          EventHub.logger.info("Command [#{command}] received")
+          @sleeper.stop
+          break
+        elsif SIGNALS_FOR_RELOAD_CONFIG.include?(command)
+          EventHub::Configuration.load!
+          EventHub.logger.info("Configuration file reloaded")
+
+          # restart listener when actor is known
+          if Celluloid::Actor[:actor_listener]
+            Celluloid::Actor[:actor_listener].async.restart
           else
-            sleep 0.5
+            EventHub.logger.info("Was unable to get a valid listener actor to restart... check!!!")
+          end
+        else
+          sleep 0.5
         end
       end
 

data/lib/eventhub/sleeper.rb

@@ -8,7 +8,7 @@ module EventHub
     end
 
     def stop
-      @writer.close if @writer and !@writer.closed?
+      @writer.close if @writer && !@writer.closed?
     end
   end
 end

data/lib/eventhub/statistics.rb

@@ -11,14 +11,12 @@ class EventHub::Statistics
   end
 
   def measure(size, &block)
-    begin
-      start = Time.now
-      yield
-      success(Time.now - start, size)
-    rescue
-      failure
-      raise
-    end
+    start = Time.now
+    yield
+    success(Time.now - start, size)
+  rescue
+    failure
+    raise
   end
 
   def success(process_time, size)

data/lib/eventhub/version.rb

@@ -1,3 +1,3 @@
 module EventHub
-  VERSION = '1.8.0'.freeze
+  VERSION = "1.9.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventhub-processor2
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Steiner, Thomas
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: standardrb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Next generation gem to build ruby based eventhub processor
 email:
 - thomas.steiner@ikey.ch
@@ -175,7 +189,7 @@ homepage: https://github.com/thomis/eventhub-processor2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Next generation gem to build ruby based eventhub processor
 test_files: []