dispatch-rider 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8c83bd0eaa995fa7670ffdefc142601edf76b67
-  data.tar.gz: 3da06e688819bd362c5ad5496ff8bb69373ff8a6
+  metadata.gz: 30af4d35a460ffed8231e8baf51fce6e2cd03d31
+  data.tar.gz: 72064d34039b26cff1d57f1e378c261f68e7a59d
 SHA512:
-  metadata.gz: 80f0873bf4ba615d32eef762af905f2c627d100183de4fabb5ddb96a849a0656ed233b4d77cd19983c540ad44f3b2bad43247eecb6d57e5c4532f169cca23c4e
-  data.tar.gz: a0488d4f6932746868fb83a60714a35b59d26798c32bc5dd82a9c2ac700c9ad914324f5ba1c49e8127fcf18d73f8435b1ab320306bc0eac434b8c5819a5a9cb9
+  metadata.gz: bafae95fb175d28736ac1ca3615c84d3e446f4736e82ba75582b092877f205dc363e9d9f26b36d8ddcc5f07b7103f63307f91ab656e557c8ffa080ea7a9e60bc
+  data.tar.gz: 6fefbc2b6f0b5f72dad10835a76c1ae810abb4f391368eb1c71f0816fc1074d4611fb519eb2451e2e5569590bf3ef460dcfdb088bcb7700b98812b1cc1087f9f

data/README.md

@@ -208,6 +208,8 @@ DispatchRider.config do |config|
     end
   end
 
+  config.logger = Rails.logger
+
   config.error_handler = DispatchRider::DefaultErrorHandler # an object that responds to .call(message, exception)
 
   config.queue_kind = :sqs
@@ -217,6 +219,11 @@ DispatchRider.config do |config|
 end
 ```
 
+Options:
+
+ * `logger` : what logger to use to send messages to (responds to the standard ruby Logger protocol), defaults to a new Logger sending messages to STDERR
+
+
 ### Callbacks
 
 Dispatch rider supports injecting callbacks in a few parts of the
@@ -237,12 +244,10 @@ To setup a subscriber you'll need message handlers. The handlers are named the s
 Sample message handler:
 ```ruby
 # app/handlers/bar_handler
-module ReadNews
-  class << self
-    def process(message_body)
-      message_body["headlines"].each do |headline|
-        puts headline
-      end
+class ReadNews < DispatchRider::Handlers::Base
+  def process(message_body)
+    message_body["headlines"].each do |headline|
+      puts headline
     end
   end
 end

data/lib/dispatch-rider/configuration.rb

@@ -1,6 +1,6 @@
 module DispatchRider
   class Configuration
-    attr_accessor :handler_path, :error_handler, :queue_info, :queue_kind, :subscriber
+    attr_accessor :handler_path, :error_handler, :queue_info, :queue_kind, :subscriber, :logger
     attr_reader :callbacks
 
     def initialize
@@ -10,6 +10,7 @@ module DispatchRider
       @queue_info = { path: "tmp/dispatch-rider-queue" }
       @callbacks = Callbacks::Storage.new
       @subscriber = DispatchRider::Subscriber
+      @logger = Logger.new(STDERR)
     end
 
     delegate :before, :after, :around, :to => :callbacks

data/lib/dispatch-rider/demultiplexer.rb

@@ -35,7 +35,7 @@ module DispatchRider
     def dispatch_message(message)
       dispatcher.dispatch(message)
     rescue => exception
-      error_handler.call(message, exception)
+      handle_message_error message, exception
       false
     end
 
@@ -48,11 +48,38 @@ module DispatchRider
       end
     end
 
+    def message_info_fragment(message)
+      "(#{message.object_id}): #{message.subject} : #{message.body.inspect}"
+    end
+
     def handle_next_queue_item
       queue.pop do |message|
-        dispatch_message(message)
+        begin
+          logger.info "Starting execution of: #{message_info_fragment(message)}"
+          dispatch_message(message)
+        ensure
+          logger.info "Completed execution of: #{message_info_fragment(message)}"
+        end
       end
     end
 
+    def exception_info_fragment(message, exception)
+      "(#{message.object_id}): #{message.subject} with #{exception.class}: #{exception.message}"
+    end
+
+    def handle_message_error(message, exception)
+      begin
+        logger.error "Failed execution of: #{exception_info_fragment(message, exception)}"
+        error_handler.call(message, exception)
+      rescue => error_handler_exception # the error handler crashed
+        logger.error "Failed error handling of: #{exception_info_fragment(message, error_handler_exception)}"
+        raise error_handler_exception
+      end
+    end
+
+    def logger
+      DispatchRider.config.logger
+    end
+
   end
 end

data/lib/dispatch-rider/runner.rb

@@ -30,12 +30,16 @@ module DispatchRider
       @callbacks ||= Callbacks::Access.new(config.callbacks)
     end
 
+    def logger
+      config.logger
+    end
+
     def ready
-      puts "Creating subscriber..."
+      logger.info "Creating subscriber..."
       @subscriber = config.subscriber.new
 
       config.handlers.each do |handler_name|
-        puts "Registering #{handler_name} handler..."
+        logger.info "Registering #{handler_name} handler..."
         @subscriber.register_handler(handler_name)
       end
     end
@@ -44,7 +48,7 @@ module DispatchRider
       kind = config.queue_kind
       info = config.queue_info
 
-      puts "Setting #{kind} queue @ #{info.to_json} ..."
+      logger.info "Setting #{kind} queue @ #{info.to_json} ..."
       @subscriber.register_queue(kind, info)
       @subscriber.setup_demultiplexer(kind, config.error_handler)
     end

data/lib/dispatch-rider/subscriber.rb

@@ -30,17 +30,38 @@ module DispatchRider
     end
 
     def process
-      Signal.trap("QUIT") { demultiplexer.stop } # signal number: 3
-      Signal.trap("TERM") { demultiplexer.stop } # signal number: 15
+      Signal.trap("QUIT") do
+        # signal number: 3
+        logger.info "Received SIGQUIT, stopping demultiplexer"
+        demultiplexer.stop
+      end
+
+      Signal.trap("TERM") do
+        # signal number: 15
+        logger.info "Received SIGTERM, stopping demultiplexer"
+        demultiplexer.stop
+      end
 
-      # user interuption
-      already_interupted = false
+      # user interruption
+      already_interrupted = false
       Signal.trap("INT") do
-        already_interupted ? exit(0) : demultiplexer.stop
-        already_interupted = true
+        if already_interrupted
+          logger.info "Received SIGINT second time, aborting"
+          exit(0)
+        else
+          logger.info "Received SIGINT first time, stopping demultiplexer"
+          demultiplexer.stop
+        end
+        already_interrupted = true
       end
 
       demultiplexer.start
     end
+
+    private
+
+    def logger
+      DispatchRider.config.logger
+    end
   end
 end

data/lib/dispatch-rider/version.rb

@@ -1,4 +1,4 @@
 # This file specifies the current version of the gem.
 module DispatchRider
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dispatch-rider
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Suman Mukherjee
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport