euston-daemons 1.0.2-java → 1.0.3-java

data/euston-daemons.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'euston-daemons'
-  s.version     = '1.0.2'
+  s.version     = '1.0.3'
   s.platform    = RUBY_PLATFORM.to_s == 'java' ? 'java' : Gem::Platform::RUBY
   s.authors     = ['Lee Henson', 'Guy Boertje']
   s.email       = ['lee.m.henson@gmail.com', 'guyboertje@gmail.com']
@@ -26,22 +26,23 @@ Gem::Specification.new do |s|
     lib/euston-daemons/event_processor_daemon/lib/settings.rb
     lib/euston-daemons/event_processor_daemon/rake_task.rb
     lib/euston-daemons/framework/basic_component.rb
+    lib/euston-daemons/framework/channel_thread.rb
     lib/euston-daemons/framework/component_shutdown.rb
     lib/euston-daemons/framework/daemon.rb
+    lib/euston-daemons/framework/handler_bindings_component.rb
     lib/euston-daemons/framework/queue.rb
     lib/euston-daemons/message_buffer_daemon/config/environment.rb
     lib/euston-daemons/message_buffer_daemon/lib/components/buffer_component.rb
     lib/euston-daemons/message_buffer_daemon/lib/components/event_store_component.rb
     lib/euston-daemons/message_buffer_daemon/lib/daemon.rb
     lib/euston-daemons/message_buffer_daemon/lib/message_logger.rb
-    lib/euston-daemons/message_buffer_daemon/lib/mongodbs.rb
     lib/euston-daemons/message_buffer_daemon/lib/publisher.rb
-    lib/euston-daemons/message_buffer_daemon/lib/read_model/message_buffer.rb
     lib/euston-daemons/message_buffer_daemon/lib/read_model/message_log.rb
     lib/euston-daemons/message_buffer_daemon/lib/settings.rb
     lib/euston-daemons/message_buffer_daemon/lib/subscriber.rb
     lib/euston-daemons/message_buffer_daemon/rake_task.rb
     lib/euston-daemons/rake_task.rb
+    lib/euston-daemons/rake_tasks.rb
     lib/euston-daemons/version.rb
   ]
   # = MANIFEST =

data/lib/euston-daemons/command_processor_daemon/config/environment.rb

@@ -8,6 +8,14 @@ Safely::Strategy::Log.logger = EUSTON_LOG
 AMQP.settings.merge! ErbYaml.read(AMQP_CONFIG_PATH, EUSTON_ENV)
 Euston::CommandProcessorDaemon::Settings.configure ErbYaml.read(DAEMON_CONFIG_PATH, EUSTON_ENV)
 
+hash = ErbYaml.read(MONGOID_CONFIG_PATH, EUSTON_ENV)
+
+event_connection = Mongo::Connection.new hash[:host], hash[:port], :safe => hash[:safe] #, :logger => EUSTON_LOG
+read_connection  = Mongo::Connection.new hash[:host], hash[:port], :safe => hash[:safe] #, :logger => EUSTON_LOG
+
+Euston::RabbitMq.event_store_mongodb = Mongo::DB.new(hash[:event_store_database], event_connection)
+Euston::RabbitMq.read_model_mongodb  = Mongo::DB.new(hash[:read_model_database], read_connection)
+
 Euston::EventStore::Persistence::Mongodb::Config.instance.logger = EUSTON_LOG
 Euston::EventStore::Persistence::Mongodb::Config.instance.database = Euston::CommandProcessorDaemon::Settings.mongo_db_name
 

data/lib/euston-daemons/command_processor_daemon/lib/components/command_handler_component.rb

@@ -1,43 +1,45 @@
 module Euston
   module CommandProcessorDaemon
     class CommandHandlerComponent
-      attr_reader :rmq_client, :cli_thread
+      include Euston::Daemons::ComponentShutdown
 
-      def initialize
-        @rmq_client = AMQP::Channel.new
+      attr_reader :cli_thread
+
+      def initialize daemon
+        @daemon = daemon
       end
 
       def start
-        @cli_thread = Thread.new do
-          begin
-            command_handler_bindings = Euston::RabbitMq::CommandHandlerBindings.new(@rmq_client)
-            command_handler_bindings.add_namespace Euston::RabbitMq::CommandHandlers
-
-            if Object.const_defined? 'COMMAND_HANDLER_NAMESPACES'
-              COMMAND_HANDLER_NAMESPACES.each do |handler_namespace|
-                ns = Object
-                found = true
-
-                handler_namespace.split('::').each do |c|
-                  if found && ns.const_defined?(c)
-                    ns = ns.const_get c.to_sym
-                  elsif found
-                    EUSTON_LOG.warn "Couldn't find requested command handler namespace: #{handler_namespace}"
-                    found = false
-                  end
-                end
-
-                if found
-                  EUSTON_LOG.debug "Successfully found command handler namespace: #{handler_namespace}"
-                  command_handler_bindings.add_namespace ns
-                end
+        handler_finder = Euston::RabbitMq::HandlerFinder.new [Euston::CommandHandler]
+        handler_finder.namespaces << Euston::RabbitMq::CommandHandlers
+        handler_finder.namespaces.push(*COMMAND_HANDLER_NAMESPACES) if Object.const_defined? 'COMMAND_HANDLER_NAMESPACES'
+        handlers = handler_finder.find
+
+        binder = Euston::RabbitMq::CommandHandlerBinder.new handlers
+        binder.ensure_bindings_exist
+
+        @cli_thread = Thread.new(@daemon, handlers) do |daemon, handlers|
+          channel_thread = Euston::Daemons::ChannelThread.new
+          channel_thread.daemon = daemon
+
+          channel_thread.run do |channel|
+            message_received = Proc.new do |message|
+              command_headers = CommandHeaders.from_hash(message[:headers]).freeze
+              command_body = message[:body].freeze
+
+              handler_type = command_headers.type.to_s.camelize.to_sym
+              handler_method_name = "__version__#{command_headers.version}"
+
+              handlers.find_all { |reference| reference.name == handler_type }.each do |reference|
+                EUSTON_LOG.debug "Delivering message to: #{reference.name}.#{handler_method_name}"
+
+                reference.handler.new.send handler_method_name, command_headers, command_body
               end
             end
 
-            command_handler_bindings.finalize_bindings
-          rescue => e
-            Thread.current[:exception] = e
-            Safely.report! e
+            Euston::RabbitMq::RetriableSubscription.new(channel, :command_handlers)
+              .when(:message_received => message_received)
+              .attach_queue_hook_listeners
           end
         end
       end
@@ -48,7 +50,6 @@ module Euston
 
       def stop
         @cli_thread[:stop] = true
-        @rmq_client.disconnect
       end
     end
   end

data/lib/euston-daemons/command_processor_daemon/lib/daemon.rb

@@ -3,7 +3,7 @@ module Euston
     class Daemon
       include Euston::Daemon
 
-      attr_reader :clients,:queue #,:ctx
+      attr_reader :clients, :queue #,:ctx
 
       def initialize #(ctx)
         @queue = Queue.new
@@ -11,7 +11,7 @@ module Euston
         @clients = {}
 
         Settings.client_instances.times do |i|
-          @clients["command_component_#{i.succ}"] = CommandHandlerComponent.new
+          @clients["command_component_#{i.succ}"] = CommandHandlerComponent.new self
         end
       end
 
@@ -25,7 +25,7 @@ module Euston
         EUSTON_LOG.debug "Components started"
 
         @clients.each do |name, component|
-          EUSTON_LOG.debug("Thread state of #{name}: #{component.thread_state.inspect}")
+          EUSTON_LOG.debug("Thread state of #{name}: #{component.thread_state}")
         end
 
         @queue.pop #<-------- stops here until interrupted

data/lib/euston-daemons/command_processor_daemon/lib/settings.rb

@@ -5,12 +5,15 @@ module Euston
         @config ||= {}
         @config.merge!(cfg) if cfg && cfg.is_a?(Hash)
       end
+
       def self.client_instances
         @config[:client_instances] || 1
       end
+
       def self.mongo_db_name
         @config[:mongo_db_name]
       end
+
       def self.debug
         @config[:debug]
       end

data/lib/euston-daemons/command_processor_daemon/rake_task.rb

@@ -1,6 +1,6 @@
 module Euston
   class CommandProcessorRakeTask < Euston::Daemons::RakeTask
-    attr_accessor :amqp_config_path, :command_handler_namespaces, :daemon_config_path
+    attr_accessor :amqp_config_path, :command_handler_namespaces, :daemon_config_path, :mongoid_config_path
 
     def initialize
       @command_handler_namespaces = []
@@ -16,11 +16,14 @@ module Euston
       EUSTON_LOG.debug "AMQP config path: #{@amqp_config_path}"
       Object.const_set :AMQP_CONFIG_PATH, @amqp_config_path
 
+      EUSTON_LOG.debug "Command handler namespaces: #{@command_handler_namespaces}"
+      Object.const_set :COMMAND_HANDLER_NAMESPACES, @command_handler_namespaces
+
       EUSTON_LOG.debug "Daemon config path: #{@daemon_config_path}"
       Object.const_set :DAEMON_CONFIG_PATH, @daemon_config_path
 
-      EUSTON_LOG.debug "Command handler namespaces: #{@command_handler_namespaces}"
-      Object.const_set :COMMAND_HANDLER_NAMESPACES, @command_handler_namespaces
+      EUSTON_LOG.debug "Mongoid config path: #{@mongoid_config_path}"
+      Object.const_set :MONGOID_CONFIG_PATH, @mongoid_config_path
     end
 
     def load_environment
@@ -28,4 +31,4 @@ module Euston
       require_rel 'config/environment.rb'
     end
   end
-end
+end

data/lib/euston-daemons/event_processor_daemon/config/environment.rb

@@ -11,13 +11,15 @@ Euston::EventProcessorDaemon::Settings.configure ErbYaml.read(DAEMON_CONFIG_PATH
 
 hash = ErbYaml.read(MONGOID_CONFIG_PATH, EUSTON_ENV)
 
-read_connection = Mongo::Connection.new hash[:host], hash[:port], :safe => hash[:safe] #, :logger => EUSTON_LOG
+event_connection = Mongo::Connection.new hash[:host], hash[:port], :safe => hash[:safe] #, :logger => EUSTON_LOG
+read_connection  = Mongo::Connection.new hash[:host], hash[:port], :safe => hash[:safe] #, :logger => EUSTON_LOG
+
+Euston::RabbitMq.event_store_mongodb = Mongo::DB.new(hash[:event_store_database], event_connection)
+Euston::RabbitMq.read_model_mongodb  = Mongo::DB.new(hash[:read_model_database], read_connection)
 
 Mongoid.configure do |config|
-  config.master = Mongo::DB.new(hash[:read_model_database], read_connection)
+  config.master = Euston::RabbitMq.read_model_mongodb
   config.logger = EUSTON_LOG
 end
 
-Euston::RabbitMq.read_model_mongodb = Mongo::DB.new(hash[:read_model_database], read_connection)
-
 I18n.load_path += Dir[I18N_LOCALES_PATH]

data/lib/euston-daemons/event_processor_daemon/lib/components/event_handler_component.rb

@@ -3,69 +3,55 @@ module Euston
     class EventHandlerComponent
       include Euston::Daemons::ComponentShutdown
 
-      attr_reader :channel, :cli_threads
+      attr_reader :cli_threads
 
-      def initialize()
-        @channel = AMQP::Channel.new
-        @channel.prefetch(1)
-        @event_handler_bindings = Euston::RabbitMq::EventHandlerBindings.new(@channel)
+      def initialize daemon
+        @daemon = daemon
+        @cli_threads = {}
+      end
 
-        if Object.const_defined? 'EVENT_HANDLER_NAMESPACES'
-          EVENT_HANDLER_NAMESPACES.each do |handler_namespace|
-            ns = Object
-            found = true
+      def start
+        handler_finder = Euston::RabbitMq::HandlerFinder.new [Euston::EventHandler]
+        handler_finder.namespaces << Euston::RabbitMq::EventHandlers
+        handler_finder.namespaces.push(*EVENT_HANDLER_NAMESPACES) if Object.const_defined? 'EVENT_HANDLER_NAMESPACES'
+        handlers = handler_finder.find
 
-            handler_namespace.split('::').each do |c|
-              if found && ns.const_defined?(c)
-                ns = ns.const_get c.to_sym
-              elsif found
-                EUSTON_LOG.warn "Couldn't find requested event handler namespace: #{handler_namespace}"
-                found = false
-              end
-            end
+        binder = Euston::RabbitMq::EventHandlerBinder.new handlers
+        binder.ensure_bindings_exist
 
-            if found
-              EUSTON_LOG.debug "Successfully found event handler namespace: #{handler_namespace}"
-              @event_handler_bindings.add_namespace ns
-            end
-          end
-        end
+        handlers.each do |reference|
+          @cli_threads[reference.handler.to_s] = Thread.new(@daemon, reference) do |daemon, reference|
+            channel_thread = Euston::Daemons::ChannelThread.new
+            channel_thread.daemon = daemon
 
-        @cli_threads = {}
-      end
+            channel_thread.run do |channel|
+              message_received = Proc.new do |message|
+                event_headers = EventHeaders.from_hash message[:headers]
+                event_body = message[:body]
 
-      def start
-        @event_handler_bindings.namespaced_handler_types.each do |namespace, handler_type|
+                handler_method_name = "__event_handler__#{event_headers.type}__#{event_headers.version}"
+
+                EUSTON_LOG.debug "Delivering message to: #{reference.handler}.#{handler_method_name}"
 
-          @cli_threads["#{namespace}.#{handler_type}"] = Thread.new(namespace, handler_type) do |ns, ht|
-            begin
-              chan = AMQP::Channel.new
-              chan.prefetch(1)
-              EUSTON_LOG.debug "EventHandlerBinding for: #{ns}.#{ht}"
-              binding = Euston::RabbitMq::EventHandlerBinding.new(chan, ns, ht)
-              binding.bind
-              binding.listen
-            rescue => e
-              Thread.current[:exception] = e
-            ensure
-              chan.disconnect
+                reference.handler.new.send handler_method_name, event_headers.freeze, event_body.freeze
+              end
+
+              Euston::RabbitMq::RetriableSubscription.new(channel, reference.name.to_s.underscore)
+                .when(:message_received => message_received)
+                .attach_queue_hook_listeners
             end
-            check_exception_and_shutdown
           end
         end
       end
 
       def thread_state
         out = {}
-        @cli_threads.each do |k, th|
-          out[k] = th.status
-        end
+        @cli_threads.each { |k, th| out[k] = th.status }
         out.inspect
       end
 
       def stop
         @cli_threads.values.each { |th| th[:stop] = true }
-        @channel.disconnect
       end
     end
   end

data/lib/euston-daemons/event_processor_daemon/lib/daemon.rb

@@ -25,7 +25,7 @@ module Euston
         # end
 
         @queue = Queue.new
-        @event_handler = EventHandlerComponent.new
+        @event_handler = EventHandlerComponent.new self
       end
 
       def run
@@ -37,14 +37,13 @@ module Euston
         #   ele.daemon = self
         #   ele.start
         # end
-        @event_handler.daemon = self
 
         name = 'event_handler'
         EUSTON_LOG.debug "Starting component: #{name}"
         @event_handler.start
 
         EUSTON_LOG.debug "Components started"
-        EUSTON_LOG.debug "Thread state of #{name}: #{@event_handler.thread_state.inspect}"
+        EUSTON_LOG.debug "Thread state of #{name}: #{@event_handler.thread_state}"
 
         # EUSTON_LOG.debug @bus.thread_state.inspect
 

data/lib/euston-daemons/event_processor_daemon/lib/settings.rb

@@ -5,15 +5,19 @@ module Euston
         @config ||= {}
         @config.merge!(cfg) if cfg && cfg.is_a?(Hash)
       end
+
       def self.server_instances
         @config[:server_instances] || 2
       end
+
       def self.bus_port_base
         (@config[:zmq_base_port] || 8200).to_i
       end
+
       def self.mongo_db_name
         @config[:mongo_db_name]
       end
+
       def self.debug
         @config[:debug]
       end

data/lib/euston-daemons/framework/channel_thread.rb

@@ -0,0 +1,22 @@
+module Euston
+  module Daemons
+    class ChannelThread
+      include ComponentShutdown
+
+      def run &blk
+        begin
+          channel = AMQP::Channel.new
+          channel.prefetch(1)
+
+          yield channel
+        rescue => e
+          Thread.current[:exception] = e
+        ensure
+          channel.disconnect unless channel.nil?
+        end
+
+        check_exception_and_shutdown
+      end
+    end
+  end
+end

data/lib/euston-daemons/framework/handler_bindings_component.rb

@@ -0,0 +1,56 @@
+# module Euston
+#   module Daemons
+#     class HandlerBindingsComponent
+#       include Euston::Daemons::ComponentShutdown
+
+#       attr_reader :cli_threads
+
+#       def initialize
+#         @cli_threads = {}
+#       end
+
+#       def start
+#         inspector = Euston::RabbitMq::HandlerInspector.new
+#         inspector.namespaces.push *handler_namespaces
+#         inspector.when(:handler_found => bind_thread_to_handler).start
+#       end
+
+#       def thread_state
+#         states = {}
+#         @cli_threads.each { |key, thread| out[key] = thread.status }
+#         states.inspect
+#       end
+
+#       def stop
+#         @cli_threads.values.each { |th| th[:stop] = true }
+#       end
+
+#       private
+
+#       def bind_thread_to_handler namespace, handler
+#         @cli_threads["#{namespace}.#{handler}"] = Thread.new(namespace, handler) do |namespace, handler|
+#           begin
+#             channel = AMQP::Channel.new
+#             channel.prefetch(1)
+
+#             EUSTON_LOG.debug "Listening on: #{namespace}.#{handler}"
+
+#             binding = HandlerBinding.new channel, namespace, handler, routing_key_prefix
+#             binding.bind
+#             binding.listen
+#           rescue => e
+#             Thread.current[:exception] = e
+#           ensure
+#             channel.disconnect
+#           end
+
+#           check_exception_and_shutdown
+#         end
+#       end
+
+#       def handler_namespaces
+#         # abstract
+#       end
+#     end
+#   end
+# end

data/lib/euston-daemons/message_buffer_daemon/config/environment.rb

@@ -14,13 +14,11 @@ hash = ErbYaml.read(MONGOID_CONFIG_PATH, EUSTON_ENV)
 event_connection = Mongo::Connection.new hash[:host], hash[:port], :safe => hash[:safe] #, :logger => EUSTON_LOG
 read_connection  = Mongo::Connection.new hash[:host], hash[:port], :safe => hash[:safe] #, :logger => EUSTON_LOG
 
-event_database = hash[:event_store_database]
-
-Euston::RabbitMq.event_store_mongodb = Euston::MessageBufferDaemon.event_store_mongodb = Mongo::DB.new event_database, event_connection
-Euston::RabbitMq.read_model_mongodb = Euston::MessageBufferDaemon.read_model_mongodb = Mongo::DB.new hash[:read_model_database], read_connection
+Euston::RabbitMq.event_store_mongodb = Mongo::DB.new(hash[:event_store_database], event_connection)
+Euston::RabbitMq.read_model_mongodb = Mongo::DB.new(hash[:read_model_database], read_connection)
 
 Euston::EventStore::Persistence::Mongodb::Config.instance.logger = EUSTON_LOG
-Euston::EventStore::Persistence::Mongodb::Config.instance.database = event_database
+Euston::EventStore::Persistence::Mongodb::Config.instance.database = hash[:event_store_database]
 
 Euston::RabbitMq.event_store = Euston::EventStore::Persistence::Mongodb::MongoPersistenceFactory.build
 Euston::RabbitMq.event_store.init

data/lib/euston-daemons/message_buffer_daemon/lib/components/buffer_component.rb

@@ -68,7 +68,6 @@ module Euston
           end
         end
       end
-
     end
   end
-end
+end

data/lib/euston-daemons/message_buffer_daemon/lib/components/event_store_component.rb

@@ -16,8 +16,9 @@ module Euston
 
       def start
         @cli_thread = Thread.new do
-          @event_buffer = Euston::MessageBufferDaemon::ReadModel::MessageBuffer.events
+          @event_buffer = Euston::RabbitMq::ReadModel::MessageBuffer.events
           @event_store = Euston::RabbitMq.event_store
+
           until Thread.current[:stop] do
             begin
               loop do

data/lib/euston-daemons/message_buffer_daemon/lib/daemon.rb

@@ -28,7 +28,7 @@ module Euston
         end
 
         @clients.each do |name, component|
-          EUSTON_LOG.debug("Thread state of #{name}: #{component.thread_state.inspect}")
+          EUSTON_LOG.debug("Thread state of #{name}: #{component.thread_state}")
         end
 
         EUSTON_LOG.debug "Components started"

data/lib/euston-daemons/message_buffer_daemon/lib/publisher.rb

@@ -14,7 +14,7 @@ module Euston
       include Euston::RabbitMq::Exchanges
 
       def initialize channel, exchange_name
-        @read_model = Euston::MessageBufferDaemon::ReadModel::MessageBuffer.send exchange_name
+        @read_model = Euston::RabbitMq::ReadModel::MessageBuffer.send exchange_name
 
         @channel = channel
         @exchange = get_exchange @channel, exchange_name

data/lib/euston-daemons/message_buffer_daemon/lib/read_model/message_log.rb

@@ -4,7 +4,7 @@ module Euston
       class MessageLog
         class << self
           def commands
-            self.new "command_log", Euston::RabbitMq.read_model_mongodb
+            self.new "command_log", Euston::RabbitMq.event_store_mongodb
           end
 
           def events
@@ -33,4 +33,4 @@ module Euston
       end
     end
   end
-end
+end

data/lib/euston-daemons/message_buffer_daemon/lib/subscriber.rb

@@ -16,7 +16,7 @@ module Euston
       include Hollywood
 
       def initialize channel, exchange_name
-        @read_model = Euston::MessageBufferDaemon::ReadModel::MessageBuffer.send exchange_name
+        @read_model = Euston::RabbitMq::ReadModel::MessageBuffer.send exchange_name
 
         @channel = channel
         @channel.prefetch(1)

data/lib/euston-daemons/rake_tasks.rb

@@ -0,0 +1,7 @@
+require 'euston-daemons'
+require 'rake/tasklib'
+
+require_rel 'rake_task.rb'
+require_rel 'command_processor_daemon/rake_task.rb'
+require_rel 'event_processor_daemon/rake_task.rb'
+require_rel 'message_buffer_daemon/rake_task.rb'

data/lib/euston-daemons/version.rb

@@ -1,5 +1,5 @@
 module Euston
   module Daemons
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/lib/euston-daemons.rb

@@ -1,6 +1,5 @@
 require 'hollywood'
 require 'logger'
-require 'rake/tasklib'
 require 'require_all'
 
 if RUBY_PLATFORM.to_s == 'java'
@@ -9,9 +8,4 @@ if RUBY_PLATFORM.to_s == 'java'
       Java::JavaUtil::UUID.randomUUID().toString()
     end
   end
-
-  require_rel 'euston-daemons/rake_task.rb'
-  require_rel 'euston-daemons/command_processor_daemon/rake_task.rb'
-  require_rel 'euston-daemons/event_processor_daemon/rake_task.rb'
-  require_rel 'euston-daemons/message_buffer_daemon/rake_task.rb'
 end

metadata

@@ -2,7 +2,7 @@
 name: euston-daemons
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.2
+  version: 1.0.3
 platform: java
 authors:
 - Lee Henson
@@ -10,161 +10,161 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000 -07:00
+date: 2011-09-20 00:00:00.000000000 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  version_requirements: &2148 !ruby/object:Gem::Requirement
+  version_requirements: &2158 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
     none: false
-  requirement: *2148
+  requirement: *2158
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &2166 !ruby/object:Gem::Requirement
+  version_requirements: &2176 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
     none: false
-  requirement: *2166
+  requirement: *2176
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: erb-yaml
-  version_requirements: &2182 !ruby/object:Gem::Requirement
+  version_requirements: &2192 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2182
+  requirement: *2192
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: hollywood
-  version_requirements: &2198 !ruby/object:Gem::Requirement
+  version_requirements: &2208 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2198
+  requirement: *2208
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: &2214 !ruby/object:Gem::Requirement
+  version_requirements: &2224 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
     none: false
-  requirement: *2214
+  requirement: *2224
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: require_all
-  version_requirements: &2230 !ruby/object:Gem::Requirement
+  version_requirements: &2240 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
     none: false
-  requirement: *2230
+  requirement: *2240
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: safely
-  version_requirements: &2246 !ruby/object:Gem::Requirement
+  version_requirements: &2256 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
     none: false
-  requirement: *2246
+  requirement: *2256
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston-rabbitmq
-  version_requirements: &2262 !ruby/object:Gem::Requirement
+  version_requirements: &2272 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2262
+  requirement: *2272
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: jessica
-  version_requirements: &2278 !ruby/object:Gem::Requirement
+  version_requirements: &2288 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2278
+  requirement: *2288
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: jmongo
-  version_requirements: &2294 !ruby/object:Gem::Requirement
+  version_requirements: &2304 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2294
+  requirement: *2304
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston
-  version_requirements: &2310 !ruby/object:Gem::Requirement
+  version_requirements: &2320 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2310
+  requirement: *2320
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston-eventstore
-  version_requirements: &2326 !ruby/object:Gem::Requirement
+  version_requirements: &2336 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2326
+  requirement: *2336
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: mongoid-glue
-  version_requirements: &2342 !ruby/object:Gem::Requirement
+  version_requirements: &2352 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2342
+  requirement: *2352
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2358 !ruby/object:Gem::Requirement
+  version_requirements: &2368 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
     none: false
-  requirement: *2358
+  requirement: *2368
   prerelease: false
   type: :development
 description: ''
@@ -191,22 +191,23 @@ files:
 - lib/euston-daemons/event_processor_daemon/lib/settings.rb
 - lib/euston-daemons/event_processor_daemon/rake_task.rb
 - lib/euston-daemons/framework/basic_component.rb
+- lib/euston-daemons/framework/channel_thread.rb
 - lib/euston-daemons/framework/component_shutdown.rb
 - lib/euston-daemons/framework/daemon.rb
+- lib/euston-daemons/framework/handler_bindings_component.rb
 - lib/euston-daemons/framework/queue.rb
 - lib/euston-daemons/message_buffer_daemon/config/environment.rb
 - lib/euston-daemons/message_buffer_daemon/lib/components/buffer_component.rb
 - lib/euston-daemons/message_buffer_daemon/lib/components/event_store_component.rb
 - lib/euston-daemons/message_buffer_daemon/lib/daemon.rb
 - lib/euston-daemons/message_buffer_daemon/lib/message_logger.rb
-- lib/euston-daemons/message_buffer_daemon/lib/mongodbs.rb
 - lib/euston-daemons/message_buffer_daemon/lib/publisher.rb
-- lib/euston-daemons/message_buffer_daemon/lib/read_model/message_buffer.rb
 - lib/euston-daemons/message_buffer_daemon/lib/read_model/message_log.rb
 - lib/euston-daemons/message_buffer_daemon/lib/settings.rb
 - lib/euston-daemons/message_buffer_daemon/lib/subscriber.rb
 - lib/euston-daemons/message_buffer_daemon/rake_task.rb
 - lib/euston-daemons/rake_task.rb
+- lib/euston-daemons/rake_tasks.rb
 - lib/euston-daemons/version.rb
 has_rdoc: true
 homepage: http://github.com/leemhenson/euston-daemons

data/lib/euston-daemons/message_buffer_daemon/lib/mongodbs.rb

@@ -1,5 +0,0 @@
-module Euston
-  module MessageBufferDaemon
-    mattr_accessor :event_store_mongodb, :read_model_mongodb
-  end
-end

data/lib/euston-daemons/message_buffer_daemon/lib/read_model/message_buffer.rb

@@ -1,56 +0,0 @@
-require_rel '../mongodbs.rb'
-
-module Euston
-  module MessageBufferDaemon
-    module ReadModel
-      class MessageBuffer
-        class << self
-          def commands
-            self.new "buffered_commands", Euston::MessageBufferDaemon.read_model_mongodb
-          end
-
-          def events
-            self.new "buffered_events", Euston::MessageBufferDaemon.event_store_mongod
-          end
-        end
-
-        def initialize name, mongodb
-          mongodb.create_collection name unless mongodb.collection_names.include? name
-
-          @collection = mongodb.collection name
-          @collection.ensure_index [ ['next_attempt', Mongo::ASCENDING] ], :unique => false, :name => "#{name}_next_attempt_index"
-        end
-
-        def buffer_new_message message
-          @collection.save({ 'doc_id' => message[:headers][:id],
-                             'type' => message[:headers][:type],
-                             'next_attempt' => (Time.now.to_f - 1.0),
-                             'json' => ActiveSupport::JSON.encode(message) }, :safe => { :fsync => true })
-        end
-
-        def find_next_message
-          query = { 'next_attempt' => { '$lte' => Time.now.to_f } }
-          @collection.find_one(query)
-        end
-
-        def find_due_messages
-          query = { 'next_attempt' => { '$lte' => Time.now.to_f }}
-          @collection.find(query)
-        end
-
-        def get_by_id id
-          @collection.find_one({ 'doc_id' => id }) #doc or nil
-        end
-
-        def set_next_attempt message
-          @collection.update({ 'doc_id' => message['doc_id'] },
-                             { '$set' => { 'next_attempt' => Time.now.to_f + 10 } }, :safe => { :fsync => true })
-        end
-
-        def remove_published_message id
-          @collection.remove({ 'doc_id' => id }, :safe => { :fsync => true })
-        end
-      end
-    end
-  end
-end