beetle 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7361b4a6ff5f5336fc8886999afda357bc63e86
-  data.tar.gz: 22b0f8c05040e216b8ba21cdd73c882a48c8bad9
+  metadata.gz: 11f94ebbdbb2e69a8f9253fd4bae0141b8c461ed
+  data.tar.gz: 6fb4333ff041cc5451ddeee58b9f1dda90287b40
 SHA512:
-  metadata.gz: 2bcb76c73b2cf8b8da54a34fce694a47e33c5be0251869ba74e488402968f6db41dfe0548640c739ff815007d38c62e440fd90fdccde23d895f390c92984ab28
-  data.tar.gz: 573787dbdbb962e27ad26f80df5c0ea0f05a3171c9aa41b116873c328f53a3393b630388a6d20937d44046b5113384e831571fc3ced81f7a52d85fcc60618089
+  metadata.gz: 26833cddbdca71091b8b4be60ffa8880e10542999aac278fd2ac64af27760ba9024f80f2716fccea7a2a57c26db0618b0425f01c831c2c6f66536aa13ba06f9a
+  data.tar.gz: b226d364d7aa0e135a8d5cebaf5ab5ac1ac7b7eab6d2758ddbb8032a2a3b6b37261b5ed738a680d3d252171ad8d0418590d4f9ecb940bd91d6083dccad0befe0

data/README.rdoc

@@ -60,6 +60,19 @@ 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, see REDIS_AUTO_FAILOVER.rdoc)
 
+== Test environment
+
+For testing purposes, you will need a MySQL database with the database
+`beetle_test` created. This is needed to test special cases in which
+Beetle handles the connection with ActiveRecord:
+
+     mysql -e 'create database beetle_test;'
+
+You also need a Redis instance running. The default configuration of Redis will work:
+
+    redis-server
+
+
 == Gem Dependencies
 
 At runtime, Beetle will use
@@ -70,7 +83,7 @@ At runtime, Beetle will use
 * {amqp}[http://github.com/ruby-amqp/amqp]
   (which is based on {eventmachine}[http://github.com/eventmachine/eventmachine])
 * {daemons}[http://daemons.rubyforge.org/]
-* activesupport
+* {activesupport}[https://github.com/rails/rails/tree/master/activesupport]
 
 For development, you'll need
 * {mocha}[http://github.com/floehopper/mocha]
@@ -78,6 +91,10 @@ For development, you'll need
 * {cucumber}[http://github.com/aslakhellesoy/cucumber]
 * {daemon_controller}[http://github.com/FooBarWidget/daemon_controller]
 
+For tests, you'll need
+* {activerecord}[https://github.com/rails/rails/tree/master/activerecord]
+* {mysql2}[https://github.com/brianmario/mysql2/]
+
 == Authors
 
 {Stefan Kaes}[http://github.com/skaes],

data/lib/beetle/message.rb

@@ -292,6 +292,7 @@ module Beetle
       Timer.timeout(@timeout.to_f) { @handler_result = handler.call(self) }
       RC::OK
     rescue Exception => @exception
+      ActiveRecord::Base.clear_all_connections! if defined?(ActiveRecord)
       Beetle::reraise_expectation_errors!
       logger.debug "Beetle: message handler crashed on #{msg_id}"
       RC::HandlerCrash

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

data/test/beetle/message_test.rb

@@ -622,6 +622,46 @@ module Beetle
 
   end
 
+  class MySQLFailoverTest < MiniTest::Unit::TestCase
+    require "active_record"
+
+    def setup
+      @store = DeduplicationStore.new
+      @store.flushdb
+
+      ActiveRecord::Base.establish_connection(
+        adapter:  "mysql2",
+        database: "beetle_test",
+        username: "root",
+        encoding: "utf8"
+      )
+    end
+
+    test "a handler that drops a MySQL query ensures the connection still works" do
+      header = header_with_params({})
+      header.expects(:ack)
+      message = Message.new("somequeue", header, "foo", :timeout => 1.second, :attempts => 2, :store => @store)
+      action = lambda do |*args|
+        # the timeout should stop the query before it finishes.
+        ActiveRecord::Base.connection.execute("select sleep(6);")
+      end
+      handler = Handler.create(action)
+      result = message.process(handler)
+      assert_equal RC::ExceptionsLimitReached, result
+
+      # second message should process without problems
+      second_header = header_with_params({})
+      second_header.expects(:ack)
+      second_message = Message.new("somequeue", second_header, "foo2", :timeout => 2.seconds, :attempts => 1, :store => @store)
+      second_action = lambda do |*args|
+        ActiveRecord::Base.connection.execute("select 1;")
+      end
+      second_handler = Handler.create(second_action)
+      second_result = second_message.process(second_handler)
+      assert_equal RC::OK, second_result
+    end
+  end
+
   class SettingsTest < MiniTest::Unit::TestCase
     def setup
       @store = DeduplicationStore.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues