beetle 0.3.0.rc.2 → 0.3.0.rc.3

data/README.rdoc

@@ -58,7 +58,7 @@ windows and execute the following commands:
 
 To set up a redundant messaging system you will need
 * at least 2 AMQP servers (we use {RabbitMQ}[http://www.rabbitmq.com/])
-* at least one {Redis}[http://github.com/antirez/redis] server (better are two in a master/slave setup)
+* at least one {Redis}[http://github.com/antirez/redis] server (better are two in a master/slave setup, see REDIS_AUTO_FAILOVER.rdoc)
 
 == Gem Dependencies
 

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,10 @@
 = Release Notes
 
+== Version 0.3.0.rc.3
+
+* use hiredis as the redis backend, which overcomes lack of proper time-outs in the "generic" redis-rb
+  gem for Ruby 1.9
+
 == Version 0.2.9.8
 
 * since version 2.0, RabbitMQ supports Basic.reject(:requeue => true). we use it now too,

data/beetle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.3.0.rc.2"
+  s.version = "0.3.0.rc.3"
   s.required_rubygems_version = ">= 1.3.7"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]
   s.date               = Time.now.strftime('%Y-%m-%d')
@@ -30,7 +30,8 @@ Gem::Specification.new do |s|
   s.specification_version = 3
   s.add_runtime_dependency("uuid4r",                [">= 0.1.2"])
   s.add_runtime_dependency("bunny",                 ["~> 0.7.1"])
-  s.add_runtime_dependency("redis",                 ["= 2.0.4"])
+  s.add_runtime_dependency("redis",                 ["= 2.2.0"])
+  s.add_runtime_dependency("hiredis",               ["= 0.3.2"])
   s.add_runtime_dependency("amqp",                  ["~> 0.6.7"])
   s.add_runtime_dependency("activesupport",         [">= 2.3.4"])
   s.add_runtime_dependency("daemons",               [">= 1.0.10"])

data/lib/beetle.rb

@@ -1,12 +1,26 @@
 $:.unshift(File.expand_path('..', __FILE__))
 require 'bunny'
 require 'uuid4r'
+require 'redis/connection/hiredis' # require *before* redis as specified in the redis-rb gem docs
+require 'redis'
 require 'active_support'
 require 'active_support/core_ext'
-require 'redis'
 require 'set'
 
 module Beetle
+  Timer = if RUBY_VERSION < "1.9"
+            begin
+              require 'system_timer'
+              SystemTimer
+            rescue Exception => e
+              warn "WARNING: It's highly recommended to install the SystemTimer gem: `gem install SystemTimer -v '=1.2.1'` See: http://ph7spot.com/musings/system-timer" if RUBY_VERSION < "1.9"
+              require 'timeout'
+              Timeout
+            end
+          else
+            require 'timeout'
+            Timeout
+          end
 
   # abstract superclass for Beetle specific exceptions
   class Error < StandardError; end
@@ -56,11 +70,4 @@ module Beetle
     def self.reraise_expectation_errors! #:nodoc:
     end
   end
-
-  Timer = begin
-    RUBY_VERSION < "1.9" ? SystemTimer : Timeout
-  rescue NameError
-    warn "WARNING: It's highly recommended to install the SystemTimer gem: `gem install SystemTimer -v '=1.2.1'` See: http://ph7spot.com/musings/system-timer" if RUBY_VERSION < "1.9"
-    Timeout
-  end
 end

data/lib/beetle/redis_configuration_server.rb

@@ -1,8 +1,8 @@
 module Beetle
   # A RedisConfigurationServer is the supervisor part of beetle's
-  # redis failover solution
+  # redis failover solution.
   #
-  # An single instance of RedisConfigurationServer works as a supervisor for
+  # A single instance of RedisConfigurationServer works as a supervisor for
   # several RedisConfigurationClient instances. It is responsible for watching
   # the redis master and electing and publishing a new master in case of failure.
   #
@@ -75,6 +75,7 @@ module Beetle
       end
     end
 
+    # called by the message dispatcher when a "client_started" message from a RedisConfigurationClient is received
     def client_started(payload)
       id = payload["id"]
       if client_id_valid?(id)
@@ -186,7 +187,7 @@ module Beetle
       end
       known_client
     end
-    
+
     def client_id_valid?(client_id)
       @client_ids.include?(client_id)
     end

data/test/beetle/deduplication_store_test.rb

@@ -9,8 +9,8 @@ module Beetle
     end
 
     test "trying to delete a non existent key doesn't throw an error" do
-      assert !@r.del("hahahaha")
       assert !@r.exists("hahahaha")
+      assert_equal 0, @r.del("hahahaha")
     end
 
     test "msetnx returns 0 or 1" do

data/test/beetle/redis_ext_test.rb

@@ -55,11 +55,9 @@ module Beetle
     end
   end
 
-  class RedisTimeoutTest < Test::Unit::TestCase
-    test "should use a timer" do
-      r = Redis.new(:host => "localhost", :port => 6390, :timeout => 1)
-      r.client.expects(:with_timeout).with(1).raises(Timeout::Error)
-      assert_equal({}, r.info_with_rescue)
+  class HiredisLoadedTest < Test::Unit::TestCase
+    test 'should be using hiredis instead of the redis ruby backend' do
+      assert defined?(Hiredis)
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 15424033
+  hash: 15424035
   prerelease: 6
   segments: 
   - 0
   - 3
   - 0
   - rc
-  - 2
-  version: 0.3.0.rc.2
+  - 3
+  version: 0.3.0.rc.3
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -20,8 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 +02:00
-default_executable: beetle
+date: 2011-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuid4r
@@ -66,15 +65,31 @@ dependencies:
         hash: 7
         segments: 
         - 2
+        - 2
         - 0
-        - 4
-        version: 2.0.4
+        version: 2.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: amqp
+  name: hiredis
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
+        version: 0.3.2
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: amqp
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -86,11 +101,11 @@ dependencies:
         - 7
         version: 0.6.7
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,11 +117,11 @@ dependencies:
         - 4
         version: 2.3.4
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: daemons
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -118,11 +133,11 @@ dependencies:
         - 10
         version: 1.0.10
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -134,11 +149,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -148,11 +163,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -162,11 +177,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: redgreen
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,11 +191,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: wirble
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,11 +205,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -206,11 +221,11 @@ dependencies:
         - 2
         version: 0.7.2
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: daemon_controller
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -220,7 +235,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 description: A highly available, reliable messaging infrastructure
 email: developers@xing.com
 executables: 
@@ -244,7 +259,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
@@ -299,7 +313,6 @@ files:
 - test/beetle_test.rb
 - test/test_helper.rb
 - bin/beetle
-has_rdoc: true
 homepage: http://xing.github.com/beetle/
 licenses: []
 
@@ -331,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 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