activemessaging-kestrel-adapter 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.0.3 / 2011-02-05
+* Introduce a 0.1 second sleep in #receive if no subscribed queues have a message
+  to avoid spin loops in the ActiveMessaging Gateway.  This is a bug, IMHO, in
+  ActiveMessaging.
+* Fix bugs in receive loop to match new ActiveMessaging 0.7.1 API
+
 == 0.0.2 / 2011-02-03
 * Implement simple retry in the face of receive errors to avoid log spew
   by the ActiveMessaging Gateway as it retries over and over.  Extensible

data/README.md

@@ -19,6 +19,7 @@ Examples
     # development:
     #   adapter: kestrel
     #   servers: localhost:22133
+    #   empty_queues_delay: 0.1
     #   retry_policy:
     #     strategy: SimpleRetry
     #     config: 

data/Rakefile

@@ -16,7 +16,7 @@ Bones {
   readme_file 'README.md'
 
   depend_on 'memcache-client'
-  depend_on 'activemessaging'
+  depend_on 'activemessaging', '>= 0.7.1'
 
   rdoc.include << 'README.md'
 

data/lib/active_messaging/adapters/kestrel.rb

@@ -7,7 +7,11 @@ module ActiveMessaging
     # kestrel message queue server.
     module Kestrel
       # Simple struct for wrapping received messages
-      Message = Struct.new(:headers, :body, :command)
+      Message = Struct.new(:headers, :body, :destination) do
+        def matches_subscription?(subscription)
+          destination.to_s == subscription.destination.value.to_s
+        end
+      end
 
       # Resolve the provided string into a class object
       def to_class(class_name, initial_scope = Kernel)
@@ -49,16 +53,20 @@ module ActiveMessaging
       class Connection < ActiveMessaging::Adapters::BaseConnection
         include ActiveMessaging::Adapter
         register :kestrel
-        attr_accessor :reliable
         # Reconnect on error
         attr_accessor :retry_policy
+        # Logging
+        attr_accessor :logger
 
-        def initialize(cfg)
+        # Create a new Kestrel adapter using the provided config
+        def initialize(cfg = {})
           cfg = symbolize_keys(cfg)
+          # TODO: Decide on fallback logging ...
+          @logger = cfg.delete(:logger) || (defined?(::Rails) && ::Rails.logger ? ::Rails.logger : nil) || default_logger
           @retry_policy = cfg.delete(:retry_policy) || {:strategy => SimpleRetry, :config => {:tries => 1, :delay => 5}}
+          @empty_queues_delay = cfg.delete(:empty_queues_delay) || 0.1
           if @retry_policy[:strategy].is_a?(String)
-            # TODO: when getting a retry policy strategy from the config file, it will be a string.  Convert it to a class
-            # using the Kestrel module as a context, then Kernel.
+            # Convert strategy from string to class
             @retry_policy[:strategy] = Kestrel.const_get(retry_policy[:strategy]) rescue Kestrel.to_class(@retry_policy[:strategy])
           end
           @config = cfg
@@ -69,6 +77,7 @@ module ActiveMessaging
 
         # Connect to the kestrel server using a Memcached client
         def connect
+          logger.debug("Creating connection to Kestrel using config #{@config.inspect}") if logger.level <= Logger::DEBUG
           @kestrel = MemCache.new(@config)
           @kestrel.servers = @config[:servers]
         end
@@ -105,25 +114,36 @@ module ActiveMessaging
         # Gets a message from any subscribed destination and returns it as a 
         # ActiveMessaging::Adaptors::Kestrel::Message object
         def receive
-          return nil if @subscriptions.size < 1
 
-          # instantiate a class for doing the retries
-          retrier = @retry_policy[:strategy].new
+          if @subscriptions.size > 0
+            # instantiate a class for doing the retries
+            retrier = @retry_policy[:strategy].new
 
-          retrier.do_work(@retry_policy[:config]) do
-            queues_to_check = @subscriptions.size > 1 ? @subscriptions.keys.sort_by{rand} : @subscriptions.keys
-            queues_to_check.each do |queue|
-              if item = @kestrel.get(normalize(queue))
-                # TODO: ActiveMessaging ought to provide a way to do messaging
-                # without having to wrap the messages in another object
-                return Message.new({'destination' => queue}, item, 'MESSAGE')
+            retrier.do_work(@retry_policy[:config]) do
+              queues_to_check = @subscriptions.size > 1 ? @subscriptions.keys.sort_by{rand} : @subscriptions.keys
+              queues_to_check.each do |queue|
+                if item = @kestrel.get(normalize(queue))
+                  # TODO: ActiveMessaging ought to provide a way to do messaging
+                  # without having to wrap the messages in another object
+                  #logger.debug("Got message from queue #{queue}: #{item}") if logger.level <= Logger::DEBUG
+                  return Message.new({'destination' => queue}, item, queue)
+                end
               end
             end
           end
+          # Sleep a little to avoid a spin loop (ActiveMessaging Gateway ought to do this)
+          sleep(@empty_queues_delay)
           return nil
         end
 
         private
+          def default_logger
+            # Create a logger on STDOUT at debug level
+            logger = Logger.new(STDOUT)
+            logger.level = Logger::DEBUG
+            logger
+          end
+
           def normalize(name)
             # Kestrel doesn't like '/' chars in queue names, so get rid of them
             # (and memoize the calculation)

data/test/test_activemessaging-kestrel-adapter.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'active_support'  # Annoying that I have to do this for the ActiveMessaging framework ...
 require 'activemessaging'
 require 'activemessaging-kestrel-adapter'
 

data/version.txt

@@ -1 +1 @@
-0.0.2
+0.0.3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemessaging-kestrel-adapter
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Douglas A. Seifert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -08:00
+date: 2011-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 49
         segments: 
         - 1
         - 8
-        - 5
-        version: 1.8.5
+        - 3
+        version: 1.8.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 1
         segments: