beetle 0.3.0.rc.9 → 0.3.0.rc.12

data/RELEASE_NOTES.rdoc

@@ -2,6 +2,7 @@
 
 == Version 0.3.0
 
+* redis master file contents now correctly reflects the state of the running configuration server
 * allow accelerating master switch via POST to redis configuration server
 * embedded http server into the redis configuration server (port 8080)
 * fixed a problem with redis shutdown command

data/beetle.gemspec

@@ -35,16 +35,16 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("uuid4r",                  [">= 0.1.2"])
   s.add_runtime_dependency("bunny",                   ["= 0.7.8"])
   s.add_runtime_dependency("redis",                   ["= 2.2.2"])
-  s.add_runtime_dependency("hiredis",                 ["= 0.3.2"])
-  s.add_runtime_dependency("amq-client",              ["= 0.8.5"])
-  s.add_runtime_dependency("amq-protocol",            ["= 0.8.3"])
-  s.add_runtime_dependency("amqp",                    ["= 0.8.2"])
+  s.add_runtime_dependency("hiredis",                 ["= 0.4.4"])
+  s.add_runtime_dependency("amq-client",              ["= 0.9.1"])
+  s.add_runtime_dependency("amq-protocol",            ["= 0.9.0"])
+  s.add_runtime_dependency("amqp",                    ["= 0.9.2"])
   s.add_runtime_dependency("activesupport",           [">= 2.3.4"])
   s.add_runtime_dependency("eventmachine_httpserver", [">= 0.2.1"])
   s.add_runtime_dependency("daemons",                 [">= 1.0.10"])
   s.add_development_dependency("rake",                [">= 0.8.7"])
   s.add_development_dependency("mocha",               [">= 0"])
-  s.add_development_dependency("rcov",                [">= 0"])
+  s.add_development_dependency("rcov",                ["~> 0.9.10"])
   s.add_development_dependency("cucumber",            [">= 0.7.2"])
   s.add_development_dependency("daemon_controller",   [">= 0"])
 end

data/features/redis_auto_failover.feature

@@ -15,6 +15,7 @@ Feature: Redis auto failover
     And the retry timeout for the redis master check is reached
     Then a system notification for "redis-1" not being available should be sent
     And the role of redis server "redis-2" should be "master"
+    And the redis master file of the redis configuration server should contain "redis-2"
     And the redis master of "rc-client-1" should be "redis-2"
     And the redis master of "rc-client-2" should be "redis-2"
     And the redis master of the beetle handler should be "redis-2"

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -95,6 +95,12 @@ Then /^the redis master of "([^\"]*)" should be "([^\"]*)"$/ do |redis_configura
   assert master, "#{redis_name} is not master of #{redis_configuration_client_name}, master file content: #{server_info.inspect}"
 end
 
+Then /^the redis master file of the redis configuration server should contain "([^"]*)"$/ do |redis_name|  # " for emacs :(
+  master_file = TestDaemons::RedisConfigurationServer.redis_master_file
+  file_contents = File.read(master_file).chomp
+  assert_equal TestDaemons::Redis[redis_name].ip_with_port, file_contents
+end
+
 Then /^the redis master of "([^\"]*)" should be undefined$/ do |redis_configuration_client_name|
   master_file = redis_master_file(redis_configuration_client_name)
   empty = false

data/lib/beetle/handler.rb

@@ -83,7 +83,7 @@ module Beetle
     # called when handler execution raised an exception and no error callback was
     # specified when the handler instance was created
     def error(exception)
-      logger.error "Beetle: handler execution raised an exception: #{exception}"
+      logger.error "Beetle: handler execution raised an exception: #{exception.class}(#{exception.message})"
     end
 
     # called when message processing has finally failed (i.e., the number of allowed

data/lib/beetle/redis_configuration_server.rb

@@ -279,6 +279,7 @@ module Beetle
         beetle.publish(:system_notification, {"message" => msg}.to_json)
 
         new_master.master!
+        write_redis_master_file(new_master.server)
         @current_master = new_master
       else
         msg = "Redis master could not be switched, no slave available to become new master, promoting old master"

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.0.rc.9"
+  VERSION = "0.3.0.rc.12"
 end

data/test/beetle/handler_test.rb

@@ -80,7 +80,7 @@ module Beetle
     test "default implementation of error and process and failure and completed should not crash" do
       handler = Handler.create(lambda {})
       handler.process
-      handler.error('barfoo')
+      handler.error(StandardError.new('barfoo'))
       handler.failure('razzmatazz')
       handler.completed
     end

data/test/beetle/redis_configuration_server_test.rb

@@ -147,6 +147,7 @@ module Beetle
       new_master = stub(:master! => nil, :server => "jo:6379")
       @server.beetle.expects(:publish).with(:system_notification, anything)
       @server.expects(:determine_new_master).returns(new_master)
+      @server.expects(:write_redis_master_file).with(new_master.server)
       @server.send :switch_master
       assert_equal new_master, @server.current_master
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 15424055
-  prerelease: 6
+  hash: 534360161
+  prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - rc
-  - 9
-  version: 0.3.0.rc.9
+  - 12
+  version: 0.3.0.rc.12
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-31 00:00:00 +01:00
+date: 2012-01-25 00:00:00 +01:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,12 +80,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 7
         segments: 
         - 0
-        - 3
-        - 2
-        version: 0.3.2
+        - 4
+        - 4
+        version: 0.4.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -96,12 +96,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 57
         segments: 
         - 0
-        - 8
-        - 5
-        version: 0.8.5
+        - 9
+        - 1
+        version: 0.9.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -112,12 +112,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 59
         segments: 
         - 0
-        - 8
-        - 3
-        version: 0.8.3
+        - 9
+        - 0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -128,12 +128,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 63
         segments: 
         - 0
-        - 8
+        - 9
         - 2
-        version: 0.8.2
+        version: 0.9.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -220,12 +220,14 @@ dependencies:
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 47
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 10
+        version: 0.9.10
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -282,7 +284,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
@@ -373,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues

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