eventhub-processor2 1.4.0 → 1.9.0

data/example/publisher.rb

@@ -1,9 +1,9 @@
-require 'bunny'
-require 'celluloid/current'
-require 'json'
-require 'securerandom'
-require 'eventhub/components'
-require_relative '../lib/eventhub/sleeper'
+require "bunny"
+require "celluloid"
+require "json"
+require "securerandom"
+require "eventhub/components"
+require_relative "../lib/eventhub/sleeper"
 
 SIGNALS_FOR_TERMINATION = [:INT, :TERM, :QUIT]
 SIGNALS_FOR_RELOAD_CONFIG = [:HUP]
@@ -12,16 +12,16 @@ PAUSE_BETWEEN_WORK = 0.05 # default is 0.05
 
 Celluloid.logger = nil
 Celluloid.exception_handler { |ex| Publisher.logger.error "Exception occured: #{ex}}" }
+Celluloid.boot
 
 # Publisher module
 module Publisher
-
   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('publisher', 'development')
+        EventHub::Components::Logger.logstash("publisher", "development")
       )
     end
     @logger
@@ -36,11 +36,11 @@ module Publisher
       @start = Time.now
       @files_sent = 0
 
-      @filename = 'data/store.json'
+      @filename = "data/store.json"
       if File.exist?(@filename)
         cleanup
       else
-        File.write(@filename, '{}')
+        File.write(@filename, "{}")
       end
 
       every(30) { write_statistics }
@@ -48,7 +48,7 @@ module Publisher
 
     def start(name)
       store = read_store
-      store[name] = Time.now.strftime('%Y-%m-%d %H:%M:%S.%L')
+      store[name] = Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")
       write_store(store)
     end
 
@@ -76,19 +76,20 @@ module Publisher
 
     def write_statistics
       now = Time.now
-      rate = @files_sent / (now-@start)
-      time_spent = (now-@start)/60
-      Publisher.logger.info("Started @ #{@start.strftime('%Y-%m-%d %H:%M:%S.%L')}: Files sent within #{'%0.1f' % time_spent} minutes: #{@files_sent}, #{ '%0.1f' % rate} files/second")
+      rate = @files_sent / (now - @start)
+      time_spent = (now - @start) / 60
+      Publisher.logger.info("Started @ #{@start.strftime("%Y-%m-%d %H:%M:%S.%L")}: Files sent within #{"%0.1f" % time_spent} minutes: #{@files_sent}, #{"%0.1f" % rate} files/second")
     end
 
     private
-      def read_store
-        JSON.parse(File.read(@filename))
-      end
 
-      def write_store(store)
-        File.write(@filename, store.to_json)
-      end
+    def read_store
+      JSON.parse(File.read(@filename))
+    end
+
+    def write_store(store)
+      File.write(@filename, store.to_json)
+    end
   end
 
   # Worker
@@ -106,26 +107,26 @@ module Publisher
         sleep PAUSE_BETWEEN_WORK
       end
     ensure
-      @connection.close if @connection
+      @connection&.close
     end
 
     private
 
     def connect
-      @connection = Bunny.new(vhost: 'event_hub',
+      @connection = Bunny.new(vhost: "event_hub",
                               automatic_recovery: false,
-                              logger: Logger.new('/dev/null'))
+                              logger: Logger.new("/dev/null"))
       @connection.start
       @channel = @connection.create_channel
       @channel.confirm_select
-      @exchange = @channel.direct('example.outbound', durable: true)
+      @exchange = @channel.direct("example.outbound", durable: true)
     end
 
     def do_the_work
-      #prepare id and content
+      # prepare id and content
       id = SecureRandom.uuid
       file_name = "data/#{id}.json"
-      data = { body: { id: id } }.to_json
+      data = {body: {id: id}}.to_json
 
       # start transaction...
       Celluloid::Actor[:transaction_store].start(id)
@@ -135,10 +136,10 @@ module Publisher
       @exchange.publish(data, persistent: true)
       success = @channel.wait_for_confirms
       if success
-        Celluloid::Actor[:transaction_store].stop(id) if Celluloid::Actor[:transaction_store]
-        Publisher.logger.info("[#{id}] - Message sent")
+        Celluloid::Actor[:transaction_store]&.stop(id)
+        Publisher&.logger&.info("[#{id}] - Message sent")
       else
-        Publisher.logger.error("[#{id}] -  Published message not confirmed")
+        Publisher&.logger&.error("[#{id}] -  Published message not confirmed")
       end
     end
   end
@@ -153,27 +154,27 @@ module Publisher
     def start_supervisor
       @config = Celluloid::Supervision::Configuration.define(
         [
-          { type: TransactionStore, as: :transaction_store },
-          { type: Worker, as: :worker }
+          {type: TransactionStore, as: :transaction_store},
+          {type: Worker, as: :worker}
         ]
       )
 
       sleeper = @sleeper
       @config.injection!(:before_restart, proc do
-        Publisher.logger.info('Restarting in 15 seconds...')
+        Publisher.logger.info("Restarting in 15 seconds...")
         sleeper.start(15)
       end)
       @config.deploy
     end
 
     def start
-      Publisher.logger.info 'Publisher has been started'
+      Publisher.logger.info "Publisher has been started"
 
       setup_signal_handler
       start_supervisor
       main_event_loop
 
-      Publisher.logger.info 'Publisher has been stopped'
+      Publisher.logger.info "Publisher has been stopped"
     end
 
     private
@@ -181,12 +182,11 @@ module Publisher
     def main_event_loop
       loop do
         command = @command_queue.pop
-        case
-          when SIGNALS_FOR_TERMINATION.include?(command)
-            @sleeper.stop
-            break
-          else
-            sleep 0.5
+        if SIGNALS_FOR_TERMINATION.include?(command)
+          @sleeper.stop
+          break
+        else
+          sleep 0.5
         end
       end
 

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
-          EventHub.logger.info("-> #{message.to_s} => return exception to dispatcher")
+          message.status_message = exception.to_s
+          EventHub.logger.info("-> #{message} => return exception to dispatcher")
           response_messages << message
         end
       end
@@ -109,21 +105,20 @@ 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
 
     def publish(args)
       @actor_publisher.publish(args)
     end
-
   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