beetle 0.3.0.rc.14 → 0.3.0.rc.16

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -5,7 +5,7 @@ end
 
 Given /^a redis server "([^\"]*)" exists as slave of "([^\"]*)"$/ do |redis_name, redis_master_name|
   TestDaemons::Redis[redis_name].start
-  Given "redis server \"#{redis_name}\" is slave of \"#{redis_master_name}\""
+  step "redis server \"#{redis_name}\" is slave of \"#{redis_master_name}\""
 end
 
 Given /^redis server "([^\"]*)" is master$/ do |redis_name|

data/lib/beetle/handler.rb

@@ -29,6 +29,7 @@ module Beetle
       @processor = processor
       @error_callback = opts[:errback]
       @failure_callback = opts[:failback]
+      @__handler_called__ = nil
     end
 
     # called when a message should be processed. if the message was caused by an RPC, the
@@ -43,6 +44,8 @@ module Beetle
       else
         process
       end
+    ensure
+      @__handler_called__ = true
     end
 
     # called for message processing if no processor was specfied when the handler instance
@@ -75,7 +78,7 @@ module Beetle
 
     # should not be overriden in subclasses
     def processing_completed
-      completed
+      completed if @__handler_called__
     rescue Exception
       Beetle::reraise_expectation_errors!
     end

data/lib/beetle/redis_configuration_client.rb

@@ -117,16 +117,19 @@ module Beetle
     end
 
     def pong!
+      logger.info "Sending pong message with id '#{id}' and token '#{@current_token}'"
       beetle.publish(:pong, {"id" => id, "token" => @current_token}.to_json)
     end
 
     def client_started!
+      logger.info "Sending client_started message with id '#{id}'"
       beetle.publish(:client_started, {"id" => id}.to_json)
     end
 
     def invalidate!
       @current_master = nil
       clear_redis_master_file
+      logger.info "Sending client_invalidated message with id '#{id}' and token '#{@current_token}'"
       beetle.publish(:client_invalidated, {"id" => id, "token" => @current_token}.to_json)
     end
 

data/lib/beetle/redis_configuration_server.rb

@@ -86,7 +86,7 @@ module Beetle
       return unless redeem_token(token)
       @client_pong_ids_received << id
       if all_client_pong_ids_received?
-        logger.debug "All client pong messages received"
+        logger.info "All client pong messages received"
         @available_timer.cancel if @available_timer
         invalidate_current_master
       end
@@ -96,10 +96,10 @@ module Beetle
     def client_started(payload)
       id = payload["id"]
       if client_id_valid?(id)
-        logger.info("Received client_started message from id '#{id}'")
+        logger.info "Received client_started message from id '#{id}'"
       else
         msg = "Received client_started message from unknown id '#{id}'"
-        logger.error(msg)
+        logger.error msg
         beetle.publish(:system_notification, {"message" => msg}.to_json)
       end
     end
@@ -152,7 +152,7 @@ module Beetle
     def initiate_master_switch
       redis.refresh
       available, switch_in_progress = master_available?, paused?
-      logger.debug "initiating master switch: already in progress = #{switch_in_progress}"
+      logger.debug "Initiating master switch: already in progress = #{switch_in_progress}"
       unless available || switch_in_progress
         master_unavailable!
       end
@@ -205,7 +205,7 @@ module Beetle
       else
         write_redis_master_file(current_master.server) if @current_master = redis.auto_detect_master
       end
-      current_master or raise NoRedisMaster.new("failed to determine initial redis master")
+      current_master or raise NoRedisMaster.new("Failed to determine initial redis master")
     end
 
     def determine_new_master
@@ -215,7 +215,8 @@ module Beetle
     def validate_pong_client_id(client_id)
       unless known_client = client_id_valid?(client_id)
         msg = "Received pong message from unknown id '#{client_id}'"
-        logger.error(msg)
+        logger.error msg
+        logger.info "Sending system_notification message with text: #{msg}"
         beetle.publish(:system_notification, {"message" => msg}.to_json)
       end
       known_client
@@ -239,12 +240,14 @@ module Beetle
 
     def check_all_clients_available
       generate_new_token
+      logger.info "Sending ping message with token '#{@current_token}'"
       beetle.publish(:ping, payload_with_current_token)
       @available_timer = EM::Timer.new(config.redis_configuration_client_timeout) { cancel_invalidation }
     end
 
     def invalidate_current_master
       generate_new_token
+      logger.info "Sending invalidate message with token '#{@current_token}'"
       beetle.publish(:invalidate, payload_with_current_token)
       @invalidate_timer = EM::Timer.new(config.redis_configuration_client_timeout) { cancel_invalidation }
     end
@@ -275,7 +278,8 @@ module Beetle
     def switch_master
       if new_master = determine_new_master
         msg = "Setting redis master to '#{new_master.server}' (was '#{current_master.server}')"
-        logger.warn(msg)
+        logger.warn msg
+        logger.info "Sending system_notification message with text: #{msg}"
         beetle.publish(:system_notification, {"message" => msg}.to_json)
 
         new_master.master!
@@ -283,7 +287,8 @@ module Beetle
         @current_master = new_master
       else
         msg = "Redis master could not be switched, no slave available to become new master, promoting old master"
-        logger.error(msg)
+        logger.error msg
+        logger.info "Sending system_notification message with text: #{msg}"
         beetle.publish(:system_notification, {"message" => msg}.to_json)
       end
 
@@ -292,7 +297,7 @@ module Beetle
     end
 
     def publish_master(master)
-      logger.info "Publishing reconfigure message with server '#{master.server}'"
+      logger.info "Sending reconfigure message with server '#{master.server}'"
       beetle.publish(:reconfigure, payload_with_current_token({"server" => master.server}))
     end
 

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.0.rc.14"
+  VERSION = "0.3.0.rc.16"
 end

data/test/beetle/handler_test.rb

@@ -103,8 +103,15 @@ module Beetle
     end
 
     test "should silently rescue exceptions in the processing_completed call" do
-      handler = Handler.create(lambda {})
+      handler = Handler.create(lambda {|m|})
       handler.expects(:completed).raises(Exception)
+      handler.call(mock("message"))
+      assert_nothing_raised {handler.processing_completed}
+    end
+
+    test "should not invoke completed method when the hander was never called" do
+      handler = Handler.create(lambda {})
+      handler.expects(:completed).never
       assert_nothing_raised {handler.processing_completed}
     end
 

data/test/beetle/redis_configuration_server_test.rb

@@ -303,38 +303,26 @@ module Beetle
     end
   end
 
-  class RedisConfigurationServerSystemNotificationAndLoggingTest < Test::Unit::TestCase
+  class RedisConfigurationServerSystemNotificationTest < Test::Unit::TestCase
     def setup
       Beetle.config.redis_configuration_client_ids = "rc-client-1,rc-client-2"
       @server = RedisConfigurationServer.new
       @server.stubs(:beetle).returns(stub(:publish))
-      @server.stubs(:logger).returns(stub)
       EventMachine.stubs(:add_timer).yields
     end
 
-    test "should log and send a system notification when pong message from unknown client received" do
+    test "should send a system notification when receiving pong message from unknown client" do
       payload = {"id" => "unknown-client", "token" => @server.current_token}
       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
+    test "should send a system notification when receiving client_started message from unknown client" 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
-
-    test "should log an info about received client_started client_started messages" do
-      payload = {"id" => "known-client"}
-      msg = "Received client_started message from id 'known-client'"
-      @server.logger.expects(:info).with(msg)
-      @server.expects(:client_id_valid?).with('known-client').returns(true)
-      @server.client_started(payload)
-    end
-
   end
 end

metadata

@@ -1,17 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: beetle
-version: !ruby/object:Gem::Version 
-  hash: -3659944352
+version: !ruby/object:Gem::Version
+  version: 0.3.0.rc.16
   prerelease: 6
-  segments: 
-  - 0
-  - 3
-  - 0
-  - rc
-  - 14
-  version: 0.3.0.rc.14
 platform: ruby
-authors: 
+authors:
 - Stefan Kaes
 - Pascal Friederich
 - Ali Jelveh
@@ -20,183 +13,181 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: uuid4r
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bunny
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 7
-        - 9
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.7.9
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 0
-        - 1
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.9
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hiredis
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 4
-        - 5
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+- !ruby/object:Gem::Dependency
+  name: hiredis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: amq-client
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: amq-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 9
-        - 3
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.9.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: amq-protocol
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: amq-protocol
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 9
-        - 3
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.9.3
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: amqp
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: amqp
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 9
-        - 6
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.9.6
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 3
-        - 4
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: eventmachine_httpserver
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.4
+- !ruby/object:Gem::Dependency
+  name: eventmachine_httpserver
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :runtime
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
-executables: 
+executables:
 - beetle
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - examples/README.rdoc
 - features/README.rdoc
 - README.rdoc
 - REDIS_AUTO_FAILOVER.rdoc
 - RELEASE_NOTES.rdoc
 - MIT-LICENSE
-files: 
+files:
 - examples/attempts.rb
 - examples/handler_class.rb
 - examples/handling_exceptions.rb
@@ -269,40 +260,36 @@ files:
 - bin/beetle
 homepage: http://xing.github.com/beetle/
 licenses: []
-
-post_install_message: "  *********************************************************************************************\n\n    Please install the SystemTimer gem if you're running a ruby version < 1.9:\n    `gem install SystemTimer -v '=1.2.1'`\n    See: http://ph7spot.com/musings/system-timer\n\n  *********************************************************************************************\n"
-rdoc_options: 
+post_install_message: ! "  *********************************************************************************************\n\n
+  \   Please install the SystemTimer gem if you're running a ruby version < 1.9:\n
+  \   `gem install SystemTimer -v '=1.2.1'`\n    See: http://ph7spot.com/musings/system-timer\n\n
+  \ *********************************************************************************************\n"
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3446454574049422431
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 21
-      segments: 
-      - 1
-      - 3
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues
-test_files: 
+test_files:
 - test/beetle/amqp_gem_behavior_test.rb
 - test/beetle/base_test.rb
 - test/beetle/beetle_test.rb