beetle 0.3.0.rc.18 → 0.3.0

data/beetle.gemspec

@@ -34,11 +34,11 @@ Gem::Specification.new do |s|
   s.specification_version = 3
   s.add_runtime_dependency("uuid4r",                  [">= 0.1.2"])
   s.add_runtime_dependency("bunny",                   ["= 0.7.9"])
-  s.add_runtime_dependency("redis",                   ["= 3.0.1"])
+  s.add_runtime_dependency("redis",                   [">= 2.2.2", "< 3.1"])
   s.add_runtime_dependency("hiredis",                 ["= 0.4.5"])
-  s.add_runtime_dependency("amq-client",              ["= 0.9.10"])
-  s.add_runtime_dependency("amq-protocol",            ["= 1.0.1"])
-  s.add_runtime_dependency("amqp",                    ["= 0.9.8"])
+  s.add_runtime_dependency("amq-client",              ["= 0.9.12"])
+  s.add_runtime_dependency("amq-protocol",            ["= 1.2.0"])
+  s.add_runtime_dependency("amqp",                    ["= 0.9.10"])
   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"])

data/features/support/test_daemons/redis_configuration_server.rb

@@ -74,8 +74,10 @@ module TestDaemons
       false
     end
 
+    HTTP_SERVER_PORT = RUBY_PLATFORM =~ /darwin/ ? 9080 : 8080
+
     def self.get_status(path, content_type)
-      uri = URI.parse("http://127.0.0.1:8080#{path}")
+      uri = URI.parse("http://127.0.0.1:#{HTTP_SERVER_PORT}#{path}")
       http = Net::HTTP.new(uri.host, uri.port)
       request = Net::HTTP::Get.new(uri.request_uri)
       request['Accept'] = content_type
@@ -84,7 +86,7 @@ module TestDaemons
     end
 
     def self.initiate_master_switch
-      http = Net::HTTP.new('127.0.0.1', 8080)
+      http = Net::HTTP.new('127.0.0.1', HTTP_SERVER_PORT)
       response = http.post '/initiate_master_switch', ''
       response
     end

data/lib/beetle/commands/configuration_server.rb

@@ -79,9 +79,10 @@ module Beetle
         Daemons.run_proc("redis_configuration_server", :log_output => true, :dir_mode => dir_mode, :dir => dir) do
           config_server =  Beetle::RedisConfigurationServer.new
           Beetle::RedisConfigurationHttpServer.config_server = config_server
+          http_server_port = RUBY_PLATFORM =~ /darwin/ ? 9080 : 8080
           EM.run do
             config_server.start
-            EM.start_server '0.0.0.0', 8080, Beetle::RedisConfigurationHttpServer
+            EM.start_server '0.0.0.0', http_server_port, Beetle::RedisConfigurationHttpServer
           end
         end
       end

data/lib/beetle/redis_ext.rb

@@ -46,4 +46,36 @@ class Redis #:nodoc:
     info["role"] == "slave" && info["master_host"] == host && info["master_port"] == port.to_s
   end
 
+  # compatibility layer for redis 2.2.2
+  # remove this once all our apps have upgraded to 3.x
+  if Redis::VERSION < "3.0"
+
+    # Redis 2 tries to establish a connection on inspect. this is evil!
+    def inspect
+      super
+    end
+
+    # redis 2.2.2 shutdown implementation does not disconnect from the redis server.
+    # this leaves the connection in an inconsistent state and causes the next command to silently fail.
+    # this in turn breaks our cucumber test scenarios.
+    # fix this here, until a new version is released which fixes the problem.
+
+    alias_method :broken_shutdown, :shutdown
+
+    # Synchronously save the dataset to disk and then shut down the server.
+    def shutdown
+      synchronize do
+        begin
+          @client.call [:shutdown]
+        rescue Errno::ECONNREFUSED
+        ensure
+          @client.disconnect
+        end
+      end
+    end
+
+    def msetnx(*values)
+      super != 0
+    end
+  end
 end

data/lib/beetle/subscriber.rb

@@ -7,6 +7,8 @@ module Beetle
     # create a new subscriber instance
     def initialize(client, options = {}) #:nodoc:
       super
+      @status = :idle
+      @request_stop = false
       @servers.concat @client.additional_subscription_servers
       @handlers = {}
       @connections = {}
@@ -51,9 +53,19 @@ module Beetle
       if @connections.empty?
         EM.stop_event_loop
       else
-        server, connection = @connections.shift
-        logger.debug "Beetle: closing connection to #{server}"
-        connection.close { stop! }
+        # Only kill connections if not currently processing a message
+        # otherwise messages can get ACKed after the connection is closed
+        # resulting in the ACK not being received and hence the
+        # message being re-delivered
+        if @status == :idle
+          server, connection = @connections.shift
+          logger.debug "Beetle: closing connection to #{server}"
+          connection.close { stop! }
+        else
+          # else ask for stop.  After processing the current message the
+          # stop will be re-attempted
+          @request_stop = true
+        end
       end
     end
 
@@ -125,6 +137,7 @@ module Beetle
       server = @server
       lambda do |header, data|
         begin
+          @status = :busy
           # logger.debug "Beetle: received message"
           processor = Handler.create(handler, opts)
           message_options = opts.merge(:server => server, :store => @client.deduplication_store)
@@ -150,6 +163,10 @@ module Beetle
         ensure
           # processing_completed swallows all exceptions, so we don't need to protect this call
           processor.processing_completed
+          @status = :idle
+          if @request_stop
+            stop!
+          end
         end
       end
     end

data/lib/beetle/version.rb

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

data/test/beetle/redis_ext_test.rb

@@ -56,7 +56,7 @@ module Beetle
   end
 
   class HiredisLoadedTest < Test::Unit::TestCase
-    test 'should be using hiredis instead of the redis ruby backend' do
+    test "should be using hiredis instead of the redis ruby backend" do
       assert defined?(Hiredis)
     end
   end
@@ -66,9 +66,27 @@ module Beetle
       @r = Redis.new(:host => "localhost", :port => 6390)
     end
 
-    test "redis shutdown implementation should call :shutdown and return nil" do
-      @r.client.expects(:call).with([:shutdown]).once.raises(Redis::ConnectionError)
-      assert_nil @r.shutdown
+    if Redis::VERSION < "3.0"
+
+      test "orginal redis shutdown implementation is broken" do
+        @r.client.expects(:call_without_reply).with([:shutdown]).once
+        @r.client.expects(:disconnect).never
+        @r.broken_shutdown
+      end
+
+      test "patched redis shutdown implementation should call :shutdown and rescue Errno::ECONNREFUSED" do
+        @r.client.expects(:call).with([:shutdown]).once.raises(Errno::ECONNREFUSED)
+        @r.client.expects(:disconnect).once
+        @r.shutdown
+      end
+
+    else
+
+      test "redis shutdown implementation should call :shutdown and return nil" do
+        @r.client.expects(:call).with([:shutdown]).once.raises(Redis::ConnectionError)
+        assert_nil @r.shutdown
+      end
+
     end
   end
 

data/test/beetle/subscriber_test.rb

@@ -22,7 +22,7 @@ module Beetle
       assert_equal channel, @sub.send(:channel, "donald:1")
     end
 
-    test "stop! should close all amqp connections and then stop the event loop" do
+    test "stop! should close all amqp connections and then stop the event loop if no handler is currently running" do
       connection1 = mock('con1')
       connection1.expects(:close).yields
       connection2 = mock('con2')
@@ -30,6 +30,19 @@ module Beetle
       @sub.instance_variable_set "@connections", [["server1", connection1], ["server2",connection2]]
       EM.expects(:stop_event_loop)
       @sub.send(:stop!)
+      assert !@sub.instance_variable_get("@request_stop")
+    end
+
+    test "stop! should not stop the event loop if a handler is currently running" do
+      @sub.instance_variable_set "@status", :busy
+      connection1 = mock('con1')
+      connection1.expects(:close).never
+      connection2 = mock('con2')
+      connection2.expects(:close).never
+      @sub.instance_variable_set "@connections", [["server1", connection1], ["server2",connection2]]
+      EM.expects(:stop_event_loop).never
+      @sub.send(:stop!)
+      assert @sub.instance_variable_get("@request_stop")
     end
 
   end
@@ -224,6 +237,14 @@ module Beetle
       assert_nothing_raised { @callback.call(header, 'foo') }
     end
 
+    test "should call stop! if @request_stop has been set" do
+      header = header_with_params({})
+      Message.any_instance.expects(:process).raises(Exception.new("don't worry"))
+      @sub.instance_variable_set("@request_stop", true)
+      @sub.expects(:stop!)
+      assert_nothing_raised { @callback.call(header, 'foo') }
+    end
+
     test "should call reject on the message header when processing the handler returns true on reject?" do
       header = header_with_params({})
       result = mock("result")

data/test/test_helper.rb

@@ -3,10 +3,11 @@ if RUBY_VERSION >= "1.9"
   require 'simplecov'
   SimpleCov.start do
     add_filter "/test/"
+    add_filter "/lib/beetle/redis_ext.rb"
   end
 end
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require 'active_support/testing/declarative'
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/beetle')

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc.18
-  prerelease: 6
+  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Stefan Kaes
@@ -13,168 +13,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.9
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.9
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 2.2.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '3.1'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.5
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.5
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: amq-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.12
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.12
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: amq-protocol
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.10
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.10
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.4
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.4
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.1
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.1
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.10
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.10
+    none: false
+  prerelease: false
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
 executables:
@@ -270,23 +276,23 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -3293468122773492105
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -863009242128424125
+      version: '0'
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.7
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues