beetle 0.2.5 → 0.2.6

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,11 @@
 = Release Notes
 
+== Version 0.2.6
+
+* Set dependency on ActiveSupport to 2.3.x since it ain't compatible to version 3.x yet
+* Publishers catch a wider range (all?) of possible exceptions when publishing messages
+* Redis Configuration Servers detect and warn when unknown Redis Configuration Clients connect
+
 == Version 0.2.5
 
 Added missing files to gem and rdoc

data/Rakefile

@@ -2,6 +2,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rcov/rcovtask'
 require 'cucumber/rake/task'
+require 'active_support'
 
 # 1.8/1.9 compatible way of loading lib/beetle.rb
 $:.unshift 'lib'

data/beetle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = ">= 1.3.1"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("bunny",                 [">= 0.6.0"])
   s.add_runtime_dependency("redis",                 [">= 2.0.4"])
   s.add_runtime_dependency("amqp",                  [">= 0.6.7"])
-  s.add_runtime_dependency("activesupport",         [">= 2.3.4"])
+  s.add_runtime_dependency("activesupport",         ["~> 2.3.4"])
   s.add_runtime_dependency("daemons",               [">= 1.0.10"])
   s.add_development_dependency("mocha",             [">= 0"])
   s.add_development_dependency("rcov",              [">= 0"])

data/lib/beetle/publisher.rb

@@ -9,6 +9,17 @@ module Beetle
       @bunnies = {}
     end
 
+    # list of exceptions potentially raised by bunny
+    # these need to be lazy, because qrack exceptions are only defined after a connection has been established
+    def bunny_exceptions
+      [
+        Bunny::ConnectionError, Bunny::ForcedChannelCloseError, Bunny::ForcedConnectionCloseError,
+        Bunny::MessageError, Bunny::ProtocolError, Bunny::ServerDownError, Bunny::UnsubscribeError,
+        Bunny::AcknowledgementError, Qrack::BufferOverflowError, Qrack::InvalidTypeError,
+        Errno::EHOSTUNREACH, Errno::ECONNRESET
+      ]
+    end
+
     def publish(message_name, data, opts={}) #:nodoc:
       opts = @client.messages[message_name].merge(opts.symbolize_keys)
       exchange_name = opts.delete(:exchange)
@@ -33,7 +44,7 @@ module Beetle
         exchange(exchange_name).publish(data, opts)
         logger.debug "Beetle: message sent!"
         published = 1
-      rescue Bunny::ServerDownError, Bunny::ConnectionError
+      rescue *bunny_exceptions
         stop!
         mark_server_dead
         tries -= 1
@@ -60,7 +71,7 @@ module Beetle
           exchange(exchange_name).publish(data, opts)
           published << @server
           logger.debug "Beetle: message sent (#{published})!"
-        rescue Bunny::ServerDownError, Bunny::ConnectionError
+        rescue *bunny_exceptions
           stop!
           mark_server_dead
         end
@@ -101,7 +112,7 @@ module Beetle
           status = msg[:header].properties[:headers][:status]
         end
         logger.debug "Beetle: rpc complete!"
-      rescue Bunny::ServerDownError, Bunny::ConnectionError
+      rescue *bunny_exceptions
         stop!
         mark_server_dead
         tries -= 1

data/lib/beetle/redis_configuration_client.rb

@@ -37,6 +37,7 @@ module Beetle
     # loop, reacting to failover related messages sent by RedisConfigurationServer.
     def start
       verify_redis_master_file_string
+      client_started!
       logger.info "RedisConfigurationClient starting (client id: #{id})"
       determine_initial_master
       clear_redis_master_file unless current_master.try(:master?)
@@ -102,6 +103,7 @@ module Beetle
         config.message :client_invalidated
         config.message :reconfigure
         config.queue   :reconfigure, :amqp_name => "#{system}_reconfigure_#{id}"
+        config.message :client_started
 
         config.handler [:ping, :invalidate, :reconfigure], MessageDispatcher
       end
@@ -118,6 +120,10 @@ module Beetle
       beetle.publish(:pong, {"id" => id, "token" => @current_token}.to_json)
     end
 
+    def client_started!
+      beetle.publish(:client_started, {"id" => id}.to_json)
+    end
+
     def invalidate!
       @current_master = nil
       clear_redis_master_file

data/lib/beetle/redis_configuration_server.rb

@@ -75,6 +75,17 @@ module Beetle
       end
     end
 
+    def client_started(payload)
+      id = payload["id"]
+      if client_id_valid?(id)
+        logger.info("Received client_started message from id #{id}")
+      else
+        msg = "Received client_started message from unknown id '#{id}'"
+        logger.error(msg)
+        beetle.publish(:system_notification, {"message" => msg}.to_json)
+      end
+    end
+
     # called by the message dispatcher when a "client_invalidated" message from a RedisConfigurationClient is received
     def client_invalidated(payload)
       id = payload["id"]
@@ -139,8 +150,10 @@ module Beetle
         config.message :invalidate
         config.message :reconfigure
         config.message :system_notification
+        config.message :client_started
+        config.queue   :client_started, :amqp_name => "#{system}_client_started"
 
-        config.handler [:pong, :client_invalidated], MessageDispatcher
+        config.handler [:pong, :client_invalidated, :client_started], MessageDispatcher
       end
     end
 
@@ -166,13 +179,17 @@ module Beetle
     end
 
     def validate_pong_client_id(client_id)
-      unless known_client = @client_ids.include?(client_id)
-        msg = "Received pong message from unknown client '#{client_id}'"
+      unless known_client = client_id_valid?(client_id)
+        msg = "Received pong message from unknown id '#{client_id}'"
         logger.error(msg)
         beetle.publish(:system_notification, {"message" => msg}.to_json)
       end
       known_client
     end
+    
+    def client_id_valid?(client_id)
+      @client_ids.include?(client_id)
+    end
 
     def redeem_token(token)
       valid_token = token == @current_token

data/test/beetle/redis_configuration_client_test.rb

@@ -10,6 +10,12 @@ module Beetle
       @client.stubs(:verify_redis_master_file_string)
     end
 
+    test "should send a client_started message when started" do
+      @client.stubs(:clear_redis_master_file)
+      @client.beetle.expects(:publish).with(:client_started, {:id => @client.id}.to_json)
+      @client.start
+    end
+
     test "config should return the beetle config" do
       assert_equal Beetle.config, @client.config
     end

data/test/beetle/redis_configuration_server_test.rb

@@ -287,10 +287,18 @@ module Beetle
 
     test "should log and send a system notification when pong message from unknown client received" do
       payload = {"id" => "unknown-client", "token" => @server.current_token}
-      msg = "Received pong message from unknown client 'unknown-client'"
+      msg = "Received pong message from unknown id 'unknown-client'"
       @server.beetle.expects(:publish).with(:system_notification, ({:message => msg}).to_json)
       @server.logger.expects(:error).with(msg)
       @server.pong(payload)
     end
+
+    test "should warn about unknown clients when receiving client_started messages" do
+      payload = {"id" => "unknown-client"}
+      msg = "Received client_started message from unknown id 'unknown-client'"
+      @server.beetle.expects(:publish).with(:system_notification, ({:message => msg}).to_json)
+      @server.logger.expects(:error).with(msg)
+      @server.client_started(payload)
+    end
   end
 end

data/test/test_helper.rb

@@ -3,9 +3,20 @@ require 'active_support'
 require 'active_support/testing/declarative'
 require 'test/unit'
 begin
-  require 'redgreen' unless ENV['TM_FILENAME'] 
+  require 'redgreen' unless ENV['TM_FILENAME']
 rescue MissingSourceFile
 end
+
+# we can remove this hack which is needed only for testing
+begin
+  require 'qrack/errors'
+rescue LoadError
+  module Qrack
+    class BufferOverflowError < StandardError; end
+    class InvalidTypeError < StandardError; end
+  end
+end
+
 require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/beetle')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-09-08 00:00:00 +02:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 11
         segments: