activemessaging-kestrel-adapter 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,6 @@
+== 0.0.4 / 2011-02-15
+* Add a queue_stats method to get stats on server queues from the adapter.
+
 == 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

data/README.md

@@ -54,13 +54,16 @@ The ability to override the policy is provided for edge cases.
 Requirements
 ------------
 
+* activemessaging >= 0.7.1 
 * memcached-client
 
+Probably activesupport as well since activemessaging barfs if you do not
+include it at the right time for certain use cases.
+
 Future
 ------
 
 * Handle a cluster of kestrel servers
-* Write some tests (need a mock kestrel service?)
 
 Install
 -------

data/lib/active_messaging/adapters/kestrel.rb

@@ -24,7 +24,7 @@ module ActiveMessaging
         # times in the face of exceptions.  Returns return result of block if
         # successful.  If number of tries is exhausted, the exception is reraised.
         # Retry loop will sleep options[:delay] seconds between retries (default 5).
-        # If you want error logging, pass in :logger.  If not provided, Rails.logger
+        # If you want error logging, pass in :logger.  If not provided, ActiveMessaging.logger
         # is used if defined.
         def do_work(options = {})
           logger = defined?(::Rails) ? ::Rails.logger : nil
@@ -58,11 +58,13 @@ module ActiveMessaging
         # Logging
         attr_accessor :logger
 
+        KESTREL_STATS_QUEUE_KEYS = [:items, :bytes, :total_items, :logsize, :expired_items, :mem_items, :mem_bytes, :age, :discarded, :waiters, :open_transactions] unless defined?(KESTREL_STATS_QUEUE_KEYS)
+
         # 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
+          @logger = cfg.delete(:logger) || ActiveMessaging.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)
@@ -75,6 +77,34 @@ module ActiveMessaging
           nil
         end
 
+        # Returns hash of hashes of hashes containing stats for each active queue
+        # in each member of the kestrel cluster.
+        # top level hash has following structure:
+        #  { "server1_def" => { "queue1" => { ... }, "queue2" => { ... } },
+        #    "server2_def" => { "queue1" => { ... }, "queue2" => { ... } } }
+        # "server_def" are host:port
+        def queue_stats
+          stats = @kestrel.stats
+          queues = stats.values.inject([]) do |queue_names, hash|
+            hash.keys.each do |key|
+              if md = /queue_(.+)_total_items/.match(key)
+                queue_names << md[1]
+              end
+            end
+            queue_names
+          end
+          stats.inject(Hash.new{|h,k| h[k] = Hash.new(&h.default_proc) }) do |return_hash, (server_def, stats_hash)|
+            queues.each do |queue|
+              KESTREL_STATS_QUEUE_KEYS.each do |key|
+                stats_key = "queue_#{queue}_#{key}"
+                denormalized_name = queue.gsub('--FS--', '/') # denormalize the name ...
+                return_hash[server_def][denormalized_name][key] = stats_hash[stats_key]
+              end
+            end
+            return_hash
+          end
+        end
+
         # 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

data/version.txt

@@ -1 +1 @@
-0.0.3
+0.0.4

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemessaging-kestrel-adapter
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Douglas A. Seifert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -08:00
+date: 2011-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,10 +75,12 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- .README.md.swp
 - History.txt
 - README.md
 - bin/activemessaging-kestrel-adapter
 files: 
+- .README.md.swp
 - .bnsignore
 - History.txt
 - README.md