eventhub-processor2 1.8.0 → 1.9.0

data/example/receiver.rb

@@ -1,9 +1,9 @@
-require_relative '../lib/eventhub/base'
+require_relative "../lib/eventhub/base"
 
 module EventHub
   class Receiver < Processor2
     def handle_message(message, args = {})
-      id = message.body['id']
+      id = message.body["id"]
       EventHub.logger.info("[#{id}] - Received")
 
       file_name = "data/#{id}.json"

data/example/router.rb

@@ -1,12 +1,12 @@
-require_relative '../lib/eventhub/base'
+require_relative "../lib/eventhub/base"
 
 module EventHub
   # Demo class
   class Router < Processor2
     def handle_message(message, args = {})
-      id = message.body['id']
+      id = message.body["id"]
       EventHub.logger.info("Received: [#{id}]")
-      publish(message: message.to_json, exchange_name: 'example.inbound')
+      publish(message: message.to_json, exchange_name: "example.inbound")
       EventHub.logger.info("Returned: [#{id}]")
       nil
     end

data/lib/eventhub/actor_heartbeat.rb

@@ -12,23 +12,23 @@ module EventHub
     end
 
     def start
-      EventHub.logger.info('Heartbeat is starting...')
+      EventHub.logger.info("Heartbeat is starting...")
 
-      every(300) { EventHub.logger.info("Actual actors: #{Celluloid::Actor.all.size}: #{Celluloid::Actor.all.map{ |a| a.class }.join(', ') }") }
+      every(60 * 60 * 24) { EventHub.logger.info("Actual actors: #{Celluloid::Actor.all.size}: #{Celluloid::Actor.all.map { |a| a.class }.join(", ")}") }
 
-      publish(heartbeat(action: 'started'))
-      EventHub.logger.info('Heartbeat has sent [started] beat')
+      publish(heartbeat(action: "started"))
+      EventHub.logger.info("Heartbeat has sent [started] beat")
       loop do
         sleep Configuration.processor[:heartbeat_cycle_in_s]
         publish(heartbeat)
-        EventHub.logger.info('Heartbeat has sent a beat')
+        EventHub.logger.info("Heartbeat has sent a beat")
       end
     end
 
     def cleanup
-      EventHub.logger.info('Heartbeat is cleaning up...')
-      publish(heartbeat(action: 'stopped'))
-      EventHub.logger.info('Heartbeat has sent a [stopped] beat')
+      EventHub.logger.info("Heartbeat is cleaning up...")
+      publish(heartbeat(action: "stopped"))
+      EventHub.logger.info("Heartbeat has sent a [stopped] beat")
     end
 
     private
@@ -43,29 +43,29 @@ module EventHub
       success = channel.wait_for_confirms
 
       unless success
-        raise 'Published heartbeat message has '\
-          'not been confirmed by the server'
+        raise "Published heartbeat message has "\
+          "not been confirmed by the server"
       end
     ensure
-      connection.close if connection
+      connection&.close
     end
 
-    def heartbeat(args = { action: 'running' })
+    def heartbeat(args = {action: "running"})
       message = EventHub::Message.new
-      message.origin_module_id  = EventHub::Configuration.name
-      message.origin_type       = 'processor'
-      message.origin_site_id    = 'global'
+      message.origin_module_id = EventHub::Configuration.name
+      message.origin_type = "processor"
+      message.origin_site_id = "global"
 
-      message.process_name      = 'event_hub.heartbeat'
+      message.process_name = "event_hub.heartbeat"
 
       now = Time.now
 
       # message structure needs more changes
       message.body = {
         version: @processor_instance.send(:version),
-        action:  args[:action],
-        pid:     Process.pid,
-        process_name: 'event_hub.heartbeat',
+        action: args[:action],
+        pid: Process.pid,
+        process_name: "event_hub.heartbeat",
         heartbeat: {
           started: now_stamp(started_at),
           stamp_last_beat: now_stamp(now),
@@ -90,11 +90,11 @@ module EventHub
     end
 
     def addresses
-      interfaces = Socket.getifaddrs.select do |interface|
+      interfaces = Socket.getifaddrs.select { |interface|
         !interface.addr.ipv4_loopback? && !interface.addr.ipv6_loopback?
-      end
+      }
 
-      interfaces.map do |interface|
+      interfaces.map { |interface|
         begin
           {
             interface: interface.name,
@@ -104,7 +104,7 @@ module EventHub
         rescue
           nil # will be ignored
         end
-      end.compact
+      }.compact
     end
 
     def messages_statistics

data/lib/eventhub/actor_listener.rb

@@ -15,14 +15,14 @@ module EventHub
     end
 
     def start
-      EventHub.logger.info('Listener is starting...')
+      EventHub.logger.info("Listener is starting...")
       EventHub::Configuration.processor[:listener_queues].each_with_index do |queue_name, index|
         async.listen(queue_name: queue_name, index: index)
       end
     end
 
     def restart
-      raise 'Listener is restarting...'
+      raise "Listener is restarting..."
     end
 
     def listen(args = {})
@@ -30,7 +30,7 @@ module EventHub
         EventHub.logger.info("Listening to queue [#{queue_name}]")
         consumer.on_delivery do |delivery_info, metadata, payload|
           EventHub.logger.info("#{queue_name}: [#{delivery_info.delivery_tag}]"\
-                                 ' delivery')
+                                 " delivery")
 
           @processor_instance.statistics.measure(payload.size) do
             handle_payload(payload: payload,
@@ -38,25 +38,21 @@ module EventHub
                            queue_name: queue_name,
                            content_type: metadata[:content_type],
                            priority: metadata[:priority],
-                           delivery_tag: delivery_info.delivery_tag
-                           )
+                           delivery_tag: delivery_info.delivery_tag)
             channel.acknowledge(delivery_info.delivery_tag, false)
           end
 
           EventHub.logger.info("#{queue_name}: [#{delivery_info.delivery_tag}]"\
-                               ' acknowledged')
+                               " acknowledged")
         end
         queue.subscribe_with(consumer, block: false)
       end
-
     rescue => error
       EventHub.logger.error("Unexpected exception: #{error}. It should restart now with this exception...")
       raise
     end
 
     def with_listen(args = {}, &block)
-      connection_string, connection_properties = connection_properties
-
       connection = create_bunny_connection
       connection.start
       queue_name = args[:queue_name]
@@ -65,11 +61,11 @@ module EventHub
       channel.prefetch(1)
       queue = channel.queue(queue_name, durable: true)
       consumer = EventHub::Consumer.new(channel,
-                                        queue,
-                                        EventHub::Configuration.name +
-                                          '-' +
-                                          args[:index].to_s,
-                                        false)
+        queue,
+        EventHub::Configuration.name +
+          "-" +
+          args[:index].to_s,
+        false)
       yield connection, channel, consumer, queue, queue_name
     end
 
@@ -86,18 +82,18 @@ module EventHub
       # return invalid messages to dispatcher
       if message.invalid?
         response_messages << message
-        EventHub.logger.info("-> #{message.to_s} => return invalid to dispatcher")
+        EventHub.logger.info("-> #{message} => return invalid to dispatcher")
       else
         begin
           response_messages = @processor_instance.send(:handle_message,
-                                                       message,
-                                                       pass_arguments(args))
+            message,
+            pass_arguments(args))
         rescue => exception
           # this catches unexpected exceptions in handle message method
           # deadletter the message via dispatcher
           message.status_code = EventHub::STATUS_DEADLETTER
           message.status_message = exception.to_s
-          EventHub.logger.info("-> #{message.to_s} => return exception to dispatcher")
+          EventHub.logger.info("-> #{message} => return exception to dispatcher")
           response_messages << message
         end
       end
@@ -109,15 +105,15 @@ module EventHub
 
     def pass_arguments(args = {})
       keys_to_pass = [:queue_name, :content_type, :priority, :delivery_tag]
-      args.select{ |key| keys_to_pass.include?(key) }
+      args.select { |key| keys_to_pass.include?(key) }
     end
 
     def cleanup
-      EventHub.logger.info('Listener is cleaning up...')
+      EventHub.logger.info("Listener is cleaning up...")
       # close all open connections
       return unless @connections
       @connections.values.each do |connection|
-        connection.close if connection
+        connection&.close
       end
     end
 

data/lib/eventhub/actor_publisher.rb

@@ -7,7 +7,7 @@ module EventHub
     finalizer :cleanup
 
     def initialize
-      EventHub.logger.info('Publisher is starting...')
+      EventHub.logger.info("Publisher is starting...")
       @connection = nil
     end
 
@@ -31,16 +31,16 @@ module EventHub
       success = channel.wait_for_confirms
 
       unless success
-        raise 'Published message from Listener actor '\
-              'has not been confirmed by the server'
+        raise "Published message from Listener actor "\
+              "has not been confirmed by the server"
       end
-      ensure
-        channel.close if channel
+    ensure
+      channel&.close
     end
 
     def cleanup
-      EventHub.logger.info('Publisher is cleaning up...')
-      @connection.close if @connection
+      EventHub.logger.info("Publisher is cleaning up...")
+      @connection&.close
     end
   end
 end

data/lib/eventhub/actor_watchdog.rb

@@ -7,20 +7,19 @@ module EventHub
     finalizer :cleanup
 
     def initialize
-      EventHub.logger.info('Watchdog is starting...')
+      EventHub.logger.info("Watchdog is starting...")
       async.start
     end
 
     def start
       loop do
-        EventHub.logger.info('Running watchdog...')
         watch
         sleep Configuration.processor[:watchdog_cycle_in_s]
       end
     end
 
     def cleanup
-      EventHub.logger.info('Watchdog is cleaning up...')
+      EventHub.logger.info("Watchdog is cleaning up...")
     end
 
     private
@@ -36,7 +35,7 @@ module EventHub
         end
       end
     ensure
-      connection.close if connection
+      connection&.close
     end
   end
 end

data/lib/eventhub/base.rb

@@ -1,36 +1,29 @@
-require 'uuidtools'
-require 'json'
-require 'base64'
-require 'optparse'
+require "uuidtools"
+require "json"
+require "base64"
+require "optparse"
 
-require 'eventhub/components'
-require 'logstash-logger'
-require 'bunny'
+require "eventhub/components"
+require "logstash-logger"
+require "bunny"
+require "celluloid"
 
-# Maybe needs refactoring in future versions ?!
-if ENV['RSPEC_PROCESSOR2']
-  require 'celluloid'
-else
-  # celluloid is booting automatically
-  require 'celluloid/current'
-end
-
-require_relative 'version'
-require_relative 'constant'
-require_relative 'base_exception'
-require_relative 'logger'
-require_relative 'helper'
-require_relative 'sleeper'
-require_relative 'hash_extensions'
-require_relative 'configuration'
-require_relative 'message'
-require_relative 'statistics'
-require_relative 'consumer'
-require_relative 'actor_heartbeat'
-require_relative 'actor_watchdog'
-require_relative 'actor_publisher'
-require_relative 'actor_listener'
-require_relative 'processor2'
+require_relative "version"
+require_relative "constant"
+require_relative "base_exception"
+require_relative "logger"
+require_relative "helper"
+require_relative "sleeper"
+require_relative "hash_extensions"
+require_relative "configuration"
+require_relative "message"
+require_relative "statistics"
+require_relative "consumer"
+require_relative "actor_heartbeat"
+require_relative "actor_watchdog"
+require_relative "actor_publisher"
+require_relative "actor_listener"
+require_relative "processor2"
 
 Celluloid.logger = nil
 Celluloid.exception_handler { |ex| EventHub.logger.error "Exception occured: #{ex}" }

data/lib/eventhub/base_exception.rb

@@ -3,9 +3,9 @@ module EventHub
   # BaseException class
   class BaseException < RuntimeError
     attr_accessor :code, :message
-    def initialize(message=nil, code=EventHub::STATUS_DEADLETTER)
+    def initialize(message = nil, code = EventHub::STATUS_DEADLETTER)
       @message = message
-      @code    = code
+      @code = code
       super(@message)
     end
   end

data/lib/eventhub/configuration.rb

@@ -6,16 +6,16 @@ module EventHub
     extend self
     extend Helper
 
-    attr_reader :name           # name of processor
-    attr_reader :environment    # environment the processor is running
-    attr_reader :detached       # run processor run as a daemon
-    attr_reader :config_file    # name of configuration file
-    attr_reader :config_data    # data from configuration file
-
-    @name = 'undefined'
-    @environment = 'development'
+    attr_reader :name # name of processor
+    attr_reader :environment # environment the processor is running
+    attr_reader :detached # run processor run as a daemon
+    attr_reader :config_file # name of configuration file
+    attr_reader :config_data # data from configuration file
+
+    @name = "undefined"
+    @environment = "development"
     @detached = false
-    @config_file = File.join(Dir.getwd, 'config', "#{@name}.json")
+    @config_file = File.join(Dir.getwd, "config", "#{@name}.json")
     @config_data = {}
 
     # set name of processor
@@ -24,32 +24,32 @@ module EventHub
     end
 
     def reset
-      @name = 'undefined'
-      @environment = 'development'
+      @name = "undefined"
+      @environment = "development"
       @detached = false
-      @config_file = File.join(Dir.getwd, 'config', "#{@name}.json")
+      @config_file = File.join(Dir.getwd, "config", "#{@name}.json")
       @config_data = {}
     end
 
     # parse options from argument list
     def parse_options(argv = ARGV)
-      @config_file = File.join(Dir.getwd, 'config', "#{@name}.json")
+      @config_file = File.join(Dir.getwd, "config", "#{@name}.json")
 
-      OptionParser.new do |opts|
-        note = 'Define environment'
-        opts.on('-e', '--environment ENVIRONMENT', note) do |environment|
+      OptionParser.new { |opts|
+        note = "Define environment"
+        opts.on("-e", "--environment ENVIRONMENT", note) do |environment|
           @environment = environment
         end
 
-        opts.on('-d', '--detached', 'Run processor detached as a daemon') do
+        opts.on("-d", "--detached", "Run processor detached as a daemon") do
           @detached = true
         end
 
-        note = 'Define configuration file'
-        opts.on('-c', '--config CONFIG', note) do |config|
+        note = "Define configuration file"
+        opts.on("-c", "--config CONFIG", note) do |config|
           @config_file = config
         end
-      end.parse!(argv)
+      }.parse!(argv)
 
       true
     rescue OptionParser::InvalidOption => e
@@ -71,7 +71,7 @@ module EventHub
         new_data = JSON.parse(File.read(@config_file), symbolize_names: true)
       rescue => e
         EventHub.logger.warn("Exception while loading configuration file: #{e}")
-        EventHub.logger.info('Using default configuration values')
+        EventHub.logger.info("Using default configuration values")
       end
 
       deep_merge!(@config_data, default_configuration)
@@ -94,13 +94,18 @@ module EventHub
         fail(NoMethodError, "unknown configuration [#{name}]", caller)
     end
 
+    def respond_to_missing?(name, include_private = false)
+      return true if @config_data[name.to_sym]
+      false
+    end
+
     def default_configuration
       {
         server: {
-          user: 'guest',
-          password: 'guest',
-          host: 'localhost',
-          vhost: 'event_hub',
+          user: "guest",
+          password: "guest",
+          host: "localhost",
+          vhost: "event_hub",
           port: 5672,
           tls: false,
           tls_cert: nil,