eventhub-processor2 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6055d052611f6817ac5917b68ea7ab9ff434878b
-  data.tar.gz: e181ff110ba25de25f863fcd1eec79c12d7063fc
+  metadata.gz: '037081a3ac65841f8c3efd865fc17e26eaafbe44'
+  data.tar.gz: c38fc7169a5368e381c89595292916d0f9368a1b
 SHA512:
-  metadata.gz: de63d420cbbe1511af91e4661d61eb03a838866b7f8550ae1b63ccb14e84f767e3c2e3480834943a13b34520d5ed73e796d7c0cf77c26201e346be7be70d9b2d
-  data.tar.gz: 192e6a6b2d95a42339568501a85522ff694483317a3d5e90c1c4b635ecfb0fd22f2229087fe0614fc77c796233e581447106a10b90a534be51601b7c5b02524d
+  metadata.gz: '081046afc2e55110f336eff3982cfbd1893849d125ff41bb3a75bfe8ad1027342964d05ffee90c25549a293d9a1a1ba6b90d76d8beea1596d4fc8b14cfc7da03'
+  data.tar.gz: f40bb241e4f25f6d12fa2715a2ab99830f56a5ee0afcc468ab8eba8de1ae8f71bfe20de0ac8918ccefa8c93a0feff454752703d6d9c7ac75f72573697425fa1b

data/.travis.yml

@@ -9,9 +9,9 @@ os:
 - linux
 
 rvm:
-- 2.4.2
-- 2.3.1
-- 2.1.5
+- 2.5.0
+- 2.4.3
+- 2.3.6
 
 env:
   - secure: R0rBtWClmnJKO+zyAncF6+1qDpZ6JQR+Z6VXzUmWw8MuxUXv732XTNYulY/tTeDW876GofAsOF9QfX/jhF+2ubV8SzM6rKTZS09feATuOWRPtECEaBOPcb0JGYouBNg/Lv4onuXb8KS/9U093sRqiJMfib82iY7QK9bnDPsYoQXtMnI7KBeQNrTV0H4nby3lvbjcpMDhmyg+anOmCP5yepZeS53Qq+C5GHguYivisvhSPmCfONrT303XxFLDo/aOkMDlceeZBDhtcpm5Px3GIwybSI9xRtAnpT73oL1Piazda6mRN7VHoT7YAHKqcJNZDB48HYuTj3Pt3oVVw0v78Cf25caBqXttXflXfB8U3qfVt+94uF0icH34NAnpW9l1B8GXHi6CTr27Hg2ZatWkQCN1rCpcCaW0eM/NoAG6snwTIwr1VvjLWpSW5wwhQgHPyMl+MRlTmCn/UM+eQSwPVhflKpMS1+ah6cbhDrQQF1jDt3dRaLqSnVE4APrafdT90SA3SCG2MGOE+pp+DX528gEsRB34UdX2V67dlwXeRu1eU5vZBR7jZrqwuwTAgSvxEF0eJWC0kgvEfouzuVHhVmmSAcNNHlg2kd0/oyQELyXTsklJghwAupcy4X/GEAyfLW9GAxItjATyV7XyfjmaBmdzHl/5JWeXicoyZ/4+8iE=

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eventhub-processor2 (1.0.1)
-      bunny (~> 2.7)
+    eventhub-processor2 (1.1.0)
+      bunny (~> 2.9)
       celluloid (~> 0.17)
       eventhub-components (~> 0.2)
       uuidtools (~> 2.1)
@@ -10,9 +10,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    amq-protocol (2.2.0)
-    bunny (2.7.2)
-      amq-protocol (>= 2.2.0)
+    amq-protocol (2.3.0)
+    bunny (2.9.1)
+      amq-protocol (~> 2.3.0)
     celluloid (0.17.3)
       celluloid-essentials
       celluloid-extras
@@ -37,7 +37,7 @@ GEM
     hitimes (1.2.6)
     json (2.1.0)
     logstash-event (1.2.02)
-    logstash-logger (0.25.1)
+    logstash-logger (0.26.0)
       logstash-event (~> 1.2)
     rake (12.3.0)
     rspec (3.7.0)

data/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM rabbitmq:3-management
+FROM rabbitmq:3.7.3-management
 ADD definitions.json /etc/rabbitmq/
 ADD rabbitmq.config /etc/rabbitmq/
 RUN chown rabbitmq:rabbitmq /etc/rabbitmq/rabbitmq.config /etc/rabbitmq/definitions.json

data/docker/definitions.json

@@ -39,7 +39,14 @@
       "arguments": {}
     },
     {
-      "name": "example",
+      "name": "example.inbound",
+      "vhost": "event_hub",
+      "durable": true,
+      "auto_delete": false,
+      "arguments": {}
+    },
+    {
+      "name": "example.outbound",
       "vhost": "event_hub",
       "durable": true,
       "auto_delete": false,
@@ -57,7 +64,16 @@
       "arguments": {}
     },
     {
-      "name": "example",
+      "name": "example.inbound",
+      "vhost": "event_hub",
+      "type": "direct",
+      "durable": true,
+      "auto_delete": false,
+      "internal": false,
+      "arguments": {}
+    },
+    {
+      "name": "example.outbound",
       "vhost": "event_hub",
       "type": "direct",
       "durable": true,
@@ -76,9 +92,17 @@
       "arguments": {}
     },
     {
-      "source": "example",
+      "source": "example.inbound",
+      "vhost": "event_hub",
+      "destination": "example.inbound",
+      "destination_type": "queue",
+      "routing_key": "",
+      "arguments": {}
+    },
+    {
+      "source": "example.outbound",
       "vhost": "event_hub",
-      "destination": "example",
+      "destination": "example.outbound",
       "destination_type": "queue",
       "routing_key": "",
       "arguments": {}

data/eventhub-processor2.gemspec

@@ -22,8 +22,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  # required by celluloid and bunny (-> amq-protocol)
+  # spec.required_ruby_version = '~> 2.2.6'
+
   spec.add_dependency 'celluloid', '~> 0.17'
-  spec.add_dependency 'bunny', '~> 2.7'
+  spec.add_dependency 'bunny', '~> 2.9'
   spec.add_dependency 'eventhub-components', '~> 0.2'
   spec.add_dependency 'uuidtools', '~> 2.1'
 

data/example/README.md

@@ -1,19 +1,30 @@
 ## Example Application
 
-### Components
-* example.rb - is listening to the example queue, reads id from message and deletes file with id in data folder
-* publisher.rb - creates a file with name id.json (id=guid) and publishes a json messages with id as content to the example exchange
-* crasher.rb - randomly restarts example processes or docker container (processor-rabbitmq)
+### Description
+
+Example application is a suite of applicaitons in order to test reliabiliy and performance of processor2 gem.
+
+How does it work?
+
+A message is passed throuhg the following components.
+publisher.rb => [example.outbound] => router.rb => [example.inbound] => receiver.rb
+
+1. publisher.rb generates a unique ID, creates a message with the ID as payload, passes the message to example.outbound queue.
+
+2. router.rb receives the message and passes it to exmaple.outbound queue
+
+3. receiver.rb gets the message and deletes the file with the given ID
+
+Goal: What ever happens to these components (restarted, killed and restarted, stopped and started, message broker restarted) if you do a graceful shutdown at the end there should be no message in the /data folder.
+
+Graceful shutdown: Stop producer.rb. Leave the other components running until all messages in example.* queues are gone. Stop remaining components.
+
 
 ### How to use
 * Make sure docker container (process-rabbitmq) is running
-* Start 1 or more example processes (I did 3)
-* Start 1 or more publisher processes ( I did 1)
-* Start one crasher.rb
-
-### What is the goal
-* See how the components work under various conditions. Feel free to manually interact (Exp. kill -9 PID)
-* There should be no files left in the data folder when all example messages are consumed
+* Start one or more router.rb
+* Start one or more receier.rb
+* Start one or more publisher.rb
+* Start crasher.rb if you like (or do it manually)
 
 ### Note
-It can happen that a file gets deleted before message is acknowledged. This message will be processed again and will just log a warning about missing file. Due to the nature of 2 independent processes it can not garanteed that both process transaction are all done or not done at all, but with message acknowledgement and and publisher confirms we can mitigate risk of lost messages.

data/example/config/{example.json → receiver.json}

@@ -9,10 +9,8 @@
       "tls": false
     },
     "processor": {
-      "heartbeat_cycle_in_s": 300,
-      "watchdog_cycle_in_s": 15,
       "listener_queues": [
-        "example"
+        "example.inbound"
       ]
     }
   }

data/example/config/router.json

@@ -0,0 +1,17 @@
+{
+  "development": {
+    "server": {
+      "user": "guest",
+      "password": "guest",
+      "host": "localhost",
+      "vhost": "event_hub",
+      "port": 5672,
+      "tls": false
+    },
+    "processor": {
+      "listener_queues": [
+        "example.outbound"
+      ]
+    }
+  }
+}

data/example/crasher.rb

@@ -1,57 +1,99 @@
-# MyProcess
-class MyProcess
-  attr_reader :id
-  def initialize(id)
-    @id = id
-  end
+require 'eventhub/components'
+require_relative '../lib/eventhub/sleeper'
+
+RESTART_RANGES_IN_SECONDS = (30..600).to_a
+PROCESS_PATTERNS = ['router', 'receiver']
 
-  def restart
-    puts "Sending Signal HUP to process [#{@id}]"
-    Process.kill('HUP', @id)
-  rescue Errno::ESRCH
+# Module Crasher
+module Crasher
+  def self.logger
+    unless @logger
+      @logger = ::EventHub::Components::MultiLogger.new
+      @logger.add_device(Logger.new(STDOUT))
+      @logger.add_device(
+        EventHub::Components::Logger.logstash('crasher', 'development')
+      )
+    end
+    @logger
   end
 
-  def self.all
-    processes = []
-    data = `ps | grep example.rb | grep ruby`
-    data.lines[0..-2].each do |line|
-      processes << MyProcess.new(line.split(' ')[0].to_i)
+  class MyProcess
+    attr_reader :id, :name
+    def initialize(id, name)
+      @id = id
+      @name = name
     end
 
-    puts "Found ids: #{processes.map{ |pr| pr.id}.join(', ')}"
-    processes
-  end
-end
+    def restart
+      Crasher.logger.info "Sending Signal HUP to process [#{@id}/#{@name}]"
+      Process.kill('HUP', @id)
+    rescue Errno::ESRCH
+    end
+
+    def self.all
+      processes = []
+      PROCESS_PATTERNS.each do |name|
+        data = `ps | grep #{name}.rb`
+        data.lines[0..-2].each do |line|
+          a = line.split(' ')
+          next if a.size > 5
+          processes << MyProcess.new(a[0].to_i, a[-1])
+        end
+      end
 
-# Docker
-class Docker
-  def initialize(name, time = 10)
-    @name = name
-    @time = time
+      Crasher.logger.info "Found ids: #{processes.map{ |pr| pr.id}.join(', ')}"
+      processes
+    end
   end
 
-  def restart
-    puts "Restart (#{@time}) [#{@name}]"
-    `docker restart -t #{@time} #{@name}`
+  # Docker
+  class Docker
+    attr_reader :name
+
+    def initialize(name, time = 10)
+      @name = name
+      @time = time
+    end
+
+    def restart
+      Crasher.logger.info "Restart (#{@time}) [#{@name}]"
+      `docker restart -t #{@time} #{@name}`
+    end
   end
-end
 
-def items
-  a = []
-  a << Docker.new('processor-rabbitmq')
-  a << Docker.new('processor-rabbitmq', 0)
-  a << MyProcess.all
-  a.flatten!
-end
 
-run = true
-Signal.trap('INT') { run = false }
+  class Application
+    def initialize
+      @sleeper = EventHub::Sleeper.new
+      @run = true
+
+      Signal.trap('INT') {
+        @run = false
+        @sleeper.stop
+      }
+    end
+
+    def pick_process
+      processes = []
+      processes << Docker.new('processor-rabbitmq')
+      processes << Docker.new('processor-rabbitmq', 0)
+      processes << MyProcess.all
+      processes.flatten.sample
+    end
 
-while run
-  to_sleep = rand(3600)
-  puts "Waiting [#{to_sleep}]..."
-  sleep to_sleep
-  items.sample.restart
+    def start
+      Crasher.logger.info "Crasher has been started"
+      while @run
+        to_sleep = RESTART_RANGES_IN_SECONDS.sample
+        Crasher.logger.info "Waiting #{to_sleep} seconds..."
+        @sleeper.start(to_sleep)
+        next unless @run
+        process = pick_process
+        process.restart if process
+      end
+      Crasher.logger.info "Crasher has been stopped"
+    end
+  end
 end
 
-puts 'Done'
+Crasher::Application.new.start

data/example/publisher.rb

@@ -2,9 +2,79 @@ require 'bunny'
 require 'celluloid/current'
 require 'json'
 require 'securerandom'
+require 'eventhub/components'
+require_relative '../lib/eventhub/sleeper'
+
+# Example module
+module Example
+  def self.logger
+    unless @logger
+      @logger = ::EventHub::Components::MultiLogger.new
+      @logger.add_device(Logger.new(STDOUT))
+      @logger.add_device(
+        EventHub::Components::Logger.logstash('publisher', 'development')
+      )
+    end
+    @logger
+  end
+end
+
+SIGNALS_FOR_TERMINATION = [:INT, :TERM, :QUIT]
+SIGNALS_FOR_RELOAD_CONFIG = [:HUP]
+ALL_SIGNALS = SIGNALS_FOR_TERMINATION + SIGNALS_FOR_RELOAD_CONFIG
 
 Celluloid.logger = nil
-Celluloid.exception_handler { |ex| puts "Exception occured: #{ex}" }
+Celluloid.exception_handler { |ex| Example.logger.error "Exception occured: #{ex}}" }
+
+# Store to track pending files (files not yet confirmed to be sent)
+class TransactionStore
+  include Celluloid
+  finalizer :cleanup
+
+  def initialize
+    @filename = 'data/store.json'
+    if File.exist?(@filename)
+      cleanup
+    else
+      File.write(@filename, '{}')
+    end
+  end
+
+  def start(name)
+    store = read_store
+    store[name] = Time.now.strftime('%Y-%m-%d %H:%M:%S.%L')
+    write_store(store)
+  end
+
+  def stop(name)
+    store = read_store
+    store.delete(name)
+    write_store(store)
+  end
+
+  def cleanup
+    # cleanup pending entries
+    Example.logger.info("Cleaning pending transactions...")
+    store = read_store
+    store.keys.each do |name|
+      name = "data/#{name}.json"
+      if File.exist?(name)
+        File.delete(name)
+        Example.logger.info("Deleted: #{name}")
+      end
+    end
+    write_store({})
+  end
+
+  private
+    def read_store
+      JSON.parse(File.read(@filename))
+    end
+
+    def write_store(store)
+      File.write(@filename, store.to_json)
+    end
+end
 
 # Publisher
 class Publisher
@@ -16,14 +86,9 @@ class Publisher
 
   def start
     connect
-    count = 1
     loop do
       do_the_work
-
-      sleep 0.001
-      print '.'
-      puts '' if (count % 80).zero?
-      count += 1
+      sleep 0.050
     end
   ensure
     @connection.close if @connection
@@ -38,57 +103,91 @@ class Publisher
     @connection.start
     @channel = @connection.create_channel
     @channel.confirm_select
-    @exchange = @channel.direct('example', durable: true)
+    @exchange = @channel.direct('example.outbound', durable: true)
   end
 
   def do_the_work
+    #prepare id and content
     id = SecureRandom.uuid
+    file_name = "data/#{id}.json"
     data = { body: { id: id } }.to_json
 
-    file = File.open("data/#{id}.json", 'w')
-    file.write(data)
-    file.close
+    # start transaction...
+    Celluloid::Actor[:transaction_store].start(id)
+    File.write(file_name, data)
+    Example.logger.info("[#{id}] - Message/File created")
 
     @exchange.publish(data, persistent: true)
     success = @channel.wait_for_confirms
-
-    raise 'Published message not confirmed' unless success
+    if success
+      Celluloid::Actor[:transaction_store].stop(id) if Celluloid::Actor[:transaction_store]
+      Example.logger.info("[#{id}] - Message sent")
+    else
+      Example.logger.error("[#{id}] -  Published message not confirmed")
+    end
   end
 end
 
 # Application
 class Application
   def initialize
-    @run = true
+    @sleeper = EventHub::Sleeper.new
+    @command_queue = []
+  end
+
+  def start_supervisor
     @config = Celluloid::Supervision::Configuration.define(
       [
+        { type: TransactionStore, as: :transaction_store },
         { type: Publisher, as: :publisher }
       ]
     )
 
+    sleeper = @sleeper
     @config.injection!(:before_restart, proc do
-      puts 'Restarting in 5 seconds...'
-      sleep 5
+      Example.logger.info('Restarting in 15 seconds...')
+      sleeper.start(15)
     end)
+    @config.deploy
   end
 
   def start
-    puts 'Publisher has been started'
-    @config.deploy
+    Example.logger.info 'Publisher has been started'
+
+    setup_signal_handler
+    start_supervisor
     main_event_loop
-    cleanup
-    puts 'Publisher has been stopped'
+
+    Example.logger.info 'Publisher has been stopped'
   end
 
   private
 
   def main_event_loop
-    Signal.trap(:INT) { @run = false }
-    sleep 0.5 while @run
-  end
+    loop do
+      command = @command_queue.pop
+      case
+        when SIGNALS_FOR_TERMINATION.include?(command)
+          @sleeper.stop
+          break
+        else
+          sleep 0.5
+      end
+    end
 
-  def cleanup
     Celluloid.shutdown
+    # make sure all actors are gone
+    while Celluloid.running?
+      sleep 0.1
+    end
+  end
+
+  def setup_signal_handler
+    # have a re-entrant signal handler by just using a simple array
+    # https://www.sitepoint.com/the-self-pipe-trick-explained/
+    ALL_SIGNALS.each do |signal|
+      Signal.trap(signal) { @command_queue << signal }
+    end
   end
 end
 

data/example/receiver.rb

@@ -0,0 +1,22 @@
+require_relative '../lib/eventhub/base'
+
+module EventHub
+  class Receiver < Processor2
+    def handle_message(message, args = {})
+      id = message.body['id']
+      EventHub.logger.info("[#{id}] - Received")
+
+      file_name = "data/#{id}.json"
+      begin
+        File.delete(file_name)
+        EventHub.logger.info("[#{id}] - File has been deleted")
+      rescue => error
+        EventHub.logger.error("[#{id}] - Unable to delete File: #{error}")
+      end
+
+      []
+    end
+  end
+end
+
+EventHub::Receiver.new.start

data/example/router.rb

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

data/lib/eventhub/actor_heartbeat.rb

@@ -14,25 +14,27 @@ module EventHub
     def start
       EventHub.logger.info('Heartbeat is starting...')
 
-      every(60) { EventHub.logger.info("Running actors: #{Celluloid::Actor.all.size}: #{Celluloid::Actor.all.map{ |a| a.class }.join(', ') }") }
+      every(300) { 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')
       loop do
         sleep Configuration.processor[:heartbeat_cycle_in_s]
-        EventHub.logger.info('Running heartbeat...')
         publish(heartbeat)
+        EventHub.logger.info('Heartbeat has sent a beat')
       end
     end
 
     def cleanup
       EventHub.logger.info('Heartbeat is cleanig up...')
       publish(heartbeat(action: 'stopped'))
+      EventHub.logger.info('Heartbeat has sent a [stopped] beat')
     end
 
     private
 
     def publish(message)
-      connection = Bunny.new(bunny_connection_properties)
+      connection = create_bunny_connection
       connection.start
       channel = connection.create_channel
       channel.confirm_select

data/lib/eventhub/actor_listener.rb

@@ -7,8 +7,9 @@ module EventHub
     finalizer :cleanup
 
     def initialize(processor_instance)
+      @actor_publisher = ActorPublisher.new_link
       @actor_watchdog = ActorWatchdog.new_link
-      @connections= {}
+      @connections = {}
       @processor_instance = processor_instance
       start
     end
@@ -31,9 +32,6 @@ module EventHub
           EventHub.logger.info("#{queue_name}: [#{delivery_info.delivery_tag}]"\
                                  ' delivery')
 
-          # EventHub::logger.debug("delivery_info: #{delivery_info.inspect}")
-          # EventHub::logger.debug("metadata: #{metadata.inspect}")
-
           @processor_instance.statistics.measure(payload.size) do
             handle_payload(payload: payload,
                            connection: connection,
@@ -50,10 +48,16 @@ module EventHub
         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 = Bunny.new(bunny_connection_properties)
+      connection_string, connection_properties = connection_properties
+
+      connection = create_bunny_connection
       connection.start
       queue_name = args[:queue_name]
       @connections[queue_name] = connection
@@ -93,7 +97,7 @@ module EventHub
           # deadletter the message via dispatcher
           message.status_code = EventHub::STATUS_DEADLETTER
           message.status_message = exception
-          EventHub.logger.info("-> #{message.to_s} => return exception to diaptcher")
+          EventHub.logger.info("-> #{message.to_s} => return exception to dispatcher")
           response_messages << message
         end
       end
@@ -108,54 +112,18 @@ module EventHub
       args.select{ |key| keys_to_pass.include?(key) }
     end
 
-    def publish(args = {})
-      with_publish(args) do |connection, exchange_name, message|
-        begin
-          channel = connection.create_channel
-          channel.confirm_select
-          exchange = channel.direct(exchange_name, durable: true)
-          exchange.publish(message, persistent: true)
-
-          success = channel.wait_for_confirms
-
-          unless success
-            raise 'Published message from Listener actor '\
-              'has not been confirmed by the server'
-          end
-        ensure
-          channel.close if channel
-        end
-      end
-    end
-
-
-    def with_publish(args = {}, &block)
-      message = args[:message]
-      return if message.nil?
-
-      need_to_close = false
-      connection = args[:connection]
-      if connection.nil?
-        connection = Bunny.new(bunny_connection_properties)
-        connection.start
-        need_to_close = true
-      end
-
-      exchange_name = args[:exchange_name] || EH_X_INBOUND
-
-      yield connection, exchange_name, message
-    ensure
-      connection.close if connection && need_to_close
-    end
-
-
     def cleanup
       EventHub.logger.info('Listener is cleanig up...')
       # close all open connections
+      return unless @connections
       @connections.values.each do |connection|
         connection.close if connection
       end
     end
 
+    def publish(args)
+      @actor_publisher.publish(args)
+    end
+
   end
 end

data/lib/eventhub/actor_publisher.rb

@@ -0,0 +1,46 @@
+# EventHub module
+module EventHub
+  # Heartbeat class
+  class ActorPublisher
+    include Celluloid
+    include Helper
+    finalizer :cleanup
+
+    def initialize
+      EventHub.logger.info('Publisher is starting...')
+      @connection = nil
+    end
+
+    def publish(args = {})
+      # keep connection once established
+      unless @connection
+        @connection = create_bunny_connection
+        @connection.start
+      end
+
+      message = args[:message]
+      return if message.nil?
+
+      exchange_name = args[:exchange_name] || EH_X_INBOUND
+
+      channel = @connection.create_channel
+      channel.confirm_select
+      exchange = channel.direct(exchange_name, durable: true)
+
+      exchange.publish(message, persistent: true)
+      success = channel.wait_for_confirms
+
+      unless success
+        raise 'Published message from Listener actor '\
+              'has not been confirmed by the server'
+      end
+      ensure
+        channel.close if channel
+    end
+
+    def cleanup
+      EventHub.logger.info('Publisher is cleanig up...')
+      @connection.close if @connection
+    end
+  end
+end

data/lib/eventhub/actor_watchdog.rb

@@ -7,6 +7,7 @@ module EventHub
     finalizer :cleanup
 
     def initialize
+      EventHub.logger.info('Watchdog is starting...')
       async.start
     end
 
@@ -25,7 +26,7 @@ module EventHub
     private
 
     def watch
-      connection = Bunny.new(bunny_connection_properties)
+      connection = create_bunny_connection
       connection.start
 
       EventHub::Configuration.processor[:listener_queues].each do |queue_name|

data/lib/eventhub/base.rb

@@ -5,12 +5,20 @@ require 'base64'
 require 'eventhub/components'
 require 'logstash-logger'
 require 'bunny'
-require 'celluloid/current'
+
+# 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 'logger'
 require_relative 'helper'
+require_relative 'sleeper'
 require_relative 'hash_extensions'
 require_relative 'configuration'
 require_relative 'message'
@@ -18,8 +26,9 @@ 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.info "Exception occured: #{ex}" }
+Celluloid.exception_handler { |ex| EventHub.logger.error "Exception occured: #{ex}" }

data/lib/eventhub/configuration.rb

@@ -101,11 +101,17 @@ module EventHub
           host: 'localhost',
           vhost: 'event_hub',
           port: 5672,
-          tls: false
+          tls: false,
+          tls_cert: nil,
+          tls_key: nil,
+          tls_ca_certificates: [],
+          verify_peer: false,
+          show_bunny_logs: false
         },
         processor: {
           heartbeat_cycle_in_s: 300,
           watchdog_cycle_in_s: 15,
+          restart_in_s: 15,
           listener_queues: [@name]
         }
       }

data/lib/eventhub/helper.rb

@@ -19,31 +19,36 @@ module EventHub
       end.compact.join('.')
     end
 
-    def bunny_connection_properties
+    def create_bunny_connection
       server = EventHub::Configuration.server
 
-      if Configuration.server[:tls]
-        {
-          user: server[:user],
-          password: server[:password],
-          host: server[:host],
-          vhost: server[:vhost],
-          port: server[:port],
-          tls: server[:tls],
-          logger: Logger.new('/dev/null'), # logs from Bunny not required
-          network_recovery_interval: 15
-        }
-      else
-        {
-          user: server[:user],
-          password: server[:password],
-          host: server[:host],
-          vhost: server[:vhost],
-          port: server[:port],
-          logger: Logger.new('/dev/null'), # logs from Bunny not required
-          network_recovery_interval: 15
-        }
+      protocol = 'amqp'
+      connection_properties = {}
+      connection_properties[:user] = server[:user]
+      connection_properties[:pass] = server[:password]
+      connection_properties[:vhost] = server[:vhost]
+
+      # inject bunny logs on request
+      unless server[:show_bunny_logs]
+        connection_properties[:logger] = Logger.new('/dev/null')
+      end
+
+      # we don't need it since reactors can deal with it
+      connection_properties[:automatically_recover] = false
+
+      # do we do tls?
+      if server[:tls]
+        protocol = "amqps"
+        connection_properties[:tls] = server[:tls]
+        connection_properties[:tls_cert] = server[:tls_cert]
+        connection_properties[:tls_key] = server[:tls_key]
+        connection_properties[:tls_ca_certificates] = server[:tls_ca_certificates]
+        connection_properties[:verify_peer] = server[:verify_peer]
       end
+
+      connection_string = "#{protocol}://#{server[:host]}:#{server[:port]}"
+
+      Bunny.new(connection_string, connection_properties)
     end
 
     # Formats stamp into UTC format

data/lib/eventhub/processor2.rb

@@ -25,6 +25,7 @@ module EventHub
 
       @command_queue = []
 
+      @sleeper = EventHub::Sleeper.new
       @started_at = Time.now
       @statistics = EventHub::Statistics.new
     end
@@ -56,10 +57,13 @@ module EventHub
       raise 'need to be implemented in derived class'
     end
 
-    # pass message: '{ "header": ... , "body": { .. }}'
+    # pass message as string like: '{ "header": ... , "body": { .. }}'
     # and optionally exchange_name: 'your exchange name'
     def publish(args = {})
       Celluloid::Actor[:actor_listener].publish(args)
+    rescue => error
+      EventHub.logger.error("Unexpected exeption while publish: #{error}")
+      raise
     end
 
     def before_start
@@ -86,9 +90,11 @@ module EventHub
         {type: ActorListener, as: :actor_listener, args: [ self ]}
       ])
 
+      sleeper = @sleeper
       @config.injection!(:before_restart, proc do
-        EventHub.logger.info('Restarting in 10 seconds...')
-        sleep 10
+        restart_in_s = Configuration.processor[:restart_in_s]
+        EventHub.logger.info("Restarting in #{restart_in_s} seconds...")
+        sleeper.start(restart_in_s)
       end )
 
       @config.deploy
@@ -103,11 +109,18 @@ module EventHub
         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')
-            Celluloid::Actor[:actor_listener].async.restart
+
+            # 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
           else
             sleep 0.5
         end

data/lib/eventhub/sleeper.rb

@@ -0,0 +1,14 @@
+# EventHub module
+module EventHub
+  # Sleep Class which can interrupt running sleep
+  class Sleeper
+    def start(seconds)
+      @reader, @writer = IO.pipe
+      IO.select([@reader], nil, nil, seconds)
+    end
+
+    def stop
+      @writer.close if @writer and !@writer.closed?
+    end
+  end
+end

data/lib/eventhub/version.rb

@@ -1,3 +1,3 @@
 module EventHub
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventhub-processor2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Steiner, Thomas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: eventhub-components
   requirement: !ruby/object:Gem::Requirement
@@ -145,12 +145,15 @@ files:
 - docker/rabbitmq.config
 - eventhub-processor2.gemspec
 - example/README.md
-- example/config/example.json
+- example/config/receiver.json
+- example/config/router.json
 - example/crasher.rb
-- example/example.rb
 - example/publisher.rb
+- example/receiver.rb
+- example/router.rb
 - lib/eventhub/actor_heartbeat.rb
 - lib/eventhub/actor_listener.rb
+- lib/eventhub/actor_publisher.rb
 - lib/eventhub/actor_watchdog.rb
 - lib/eventhub/base.rb
 - lib/eventhub/configuration.rb
@@ -161,6 +164,7 @@ files:
 - lib/eventhub/logger.rb
 - lib/eventhub/message.rb
 - lib/eventhub/processor2.rb
+- lib/eventhub/sleeper.rb
 - lib/eventhub/statistics.rb
 - lib/eventhub/version.rb
 homepage: https://github.com/thomis/eventhub-processor2
@@ -183,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Next generation gem to build ruby based eventhub processor

data/example/example.rb

@@ -1,25 +0,0 @@
-require_relative '../lib/eventhub'
-
-module EventHub
-  # Demo class
-  class Example < Processor2
-    def handle_message(message, args = {})
-      id = message.body['id']
-      name = "data/#{id}.json"
-
-      begin
-        File.delete(name)
-      rescue => ex
-        EventHub.logger.warn("File [#{name}]: #{ex}")
-      end
-
-      { body: { id: id, message: 'has been done'}}
-    end
-
-    def version
-      '10.1.1'
-    end
-  end
-end
-
-EventHub::Example.new.start