beetle 0.3.0.rc.14 → 0.3.0.rc.15

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/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.15"
 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,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: -3659944352
+  hash: -946228374
   prerelease: 6
   segments: 
   - 0
   - 3
   - 0
   - rc
-  - 14
-  version: 0.3.0.rc.14
+  - 15
+  version: 0.3.0.rc.15
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -21,11 +21,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-01 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: uuid4r
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -37,11 +35,11 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bunny
   prerelease: false
+  type: :runtime
+  name: uuid4r
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -53,11 +51,11 @@ dependencies:
         - 7
         - 9
         version: 0.7.9
-  type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
+  type: :runtime
+  name: bunny
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,11 +67,11 @@ dependencies:
         - 0
         - 1
         version: 3.0.1
-  type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hiredis
   prerelease: false
+  type: :runtime
+  name: redis
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -85,11 +83,11 @@ dependencies:
         - 4
         - 5
         version: 0.4.5
-  type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: amq-client
   prerelease: false
+  type: :runtime
+  name: hiredis
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -101,11 +99,11 @@ dependencies:
         - 9
         - 3
         version: 0.9.3
-  type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: amq-protocol
   prerelease: false
+  type: :runtime
+  name: amq-client
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -117,11 +115,11 @@ dependencies:
         - 9
         - 3
         version: 0.9.3
-  type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: amqp
   prerelease: false
+  type: :runtime
+  name: amq-protocol
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -133,11 +131,11 @@ dependencies:
         - 9
         - 6
         version: 0.9.6
-  type: :runtime
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
+  type: :runtime
+  name: amqp
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -149,11 +147,11 @@ dependencies:
         - 3
         - 4
         version: 2.3.4
-  type: :runtime
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: eventmachine_httpserver
   prerelease: false
+  type: :runtime
+  name: activesupport
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -165,11 +163,11 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
-  type: :runtime
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
+  type: :runtime
+  name: eventmachine_httpserver
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -181,8 +179,10 @@ dependencies:
         - 0
         - 10
         version: 1.0.10
-  type: :runtime
   version_requirements: *id010
+  prerelease: false
+  type: :runtime
+  name: daemons
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
 executables: 
@@ -207,7 +207,6 @@ files:
 - examples/redundant.rb
 - examples/rpc.rb
 - examples/simple.rb
-- examples/test_publisher.rb
 - lib/beetle/base.rb
 - lib/beetle/client.rb
 - lib/beetle/commands/configuration_client.rb

data/examples/test_publisher.rb

@@ -1,32 +0,0 @@
-# attempts.rb
-# this example shows you how to use the exception limiting feature of beetle
-# it allows you to control the number of retries your handler will go through
-# with one message before giving up on it
-#
-# ! check the examples/README.rdoc for information on starting your redis/rabbit !
-#
-# start it with ruby attempts.rb
-
-require "rubygems"
-require File.expand_path("../lib/beetle", File.dirname(__FILE__))
-require "eventmachine"
-
-# set Beetle log level to info, less noisy than debug
-Beetle.config.logger.level = Logger::INFO
-
-# setup client
-client = Beetle::Client.new
-client.register_message(:test)
-
-n = 0
-EM.run do
-  EM.add_periodic_timer(0.1) do
-    data = (n+=1)
-    client.logger.info "publishing #{data}"
-    client.publish(:test, data)
-  end
-  trap("INT") do
-    client.stop_publishing
-    EM.stop_event_loop
-  end
-end