combi 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3a283e392128d694635fce6d3c7dd96de05d5ac
-  data.tar.gz: 764eb5e7ad402be1b8940982e77dc16cf1fa29cd
+  metadata.gz: b4b7f86ff2d0ee05ef90a678b852c529bf126517
+  data.tar.gz: d42e6f431566d2a2665a34ebd247b967c745e0d8
 SHA512:
-  metadata.gz: 94f13d90ebe75c453e209ae69109e4a0173c6df4c4a1258fc26b79b07ff1e002db408584dc98a0da2e526df8581dda276f4bd58db2825a0df7d850458f47e351
-  data.tar.gz: ff64c2764b536b5a7bc501a3228fc0eb431eb4215e2492f7572abe91bb07744915b36606297652e4740ebd86d60f5d2f3620103044a4eb9b021f870d6762dbfc
+  metadata.gz: 1fc53639816bcaa94dd0f430f331960b78c12dd992abbc048c9c7d1ad110bdf2075f7990f4471abb170b5e47db4bc4aa88cd5e71542a56d34e65958a9dce9a02
+  data.tar.gz: 9d21649b35a445d472d419e7e211324d5289cd30a62dae65663424ee5d1dd4c9be1e4e01d804b81425892d4cc1c1e3f759bd34c80dbfa34861a2d6df12e8f90a

data/lib/combi/queue_service.rb

@@ -11,9 +11,11 @@ module Combi
       @options = options
       @rpc_queue = nil
       @ready_defer = EventMachine::DefaultDeferrable.new
+      @ready_callbacks = []
     end
 
     def ready(&block)
+      @ready_callbacks << block
       @ready_defer.callback &block
     end
 
@@ -23,25 +25,30 @@ module Combi
     end
 
     def start
+      @config[:on_tcp_connection_failure] = Proc.new { EM.add_timer(4 * rand) { start } }
       connect @config do
         if @options[:rpc] == :enabled
           create_rpc_queue
         else
-          puts "ready"
           @ready_defer.succeed
         end
       end
     end
 
     def connect(config, &after_connect)
+      puts "[INFO] trying to connect to queue"
       @amqp_conn = AMQP.connect(config) do |connection, open_ok|
         @channel = AMQP::Channel.new @amqp_conn
         @channel.auto_recovery = true
         @exchange = @channel.direct ''
         after_connect.call
         connection.on_tcp_connection_loss do |conn, settings|
-          puts "[network failure] Trying to reconnect..."
-          conn.reconnect(false, 2)
+          puts "[ERROR] Connection failed, resetting for reconnect"
+          @ready_defer = EventMachine::DefaultDeferrable.new
+          @ready_callbacks.each do |callback|
+            @ready_defer.callback &callback
+          end
+          start
         end
       end
     end
@@ -87,7 +94,7 @@ module Combi
     def call(kind, message, options = {})
       log "sending request #{kind} #{message.inspect[0..500]} with options #{options.inspect}"
       raise "RPC is not enabled or reply_to is not included" if (@rpc_queue.nil? || @rpc_queue.name.nil?) && options[:reply_to].nil?
-      options[:expiration] = (options[:timeout] || RPC_DEFAULT_TIMEOUT) * 1000
+      options[:expiration] = ((options[:timeout] || RPC_DEFAULT_TIMEOUT) * 1000).to_i
       options[:routing_key] ||= 'rcalls_queue'
       options[:reply_to] ||= @rpc_queue.name
       request = {

data/lib/combi/version.rb

@@ -1,3 +1,3 @@
 module Combi
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

data/spec/lib/combi/buses/queue_spec.rb

@@ -6,6 +6,12 @@ require 'combi/buses/queue'
 describe 'Combi::Queue' do
   include EventedSpec::SpecHelper
 
+  before(:all) do
+    RabbitmqServer.instance.stop! if ENV['CLEAN']
+    RabbitmqServer.instance.start!
+  end
+  after(:all) { RabbitmqServer.instance.stop! if ENV['CLEAN'] }
+
   context 'can be instanitated via ServiceBus' do
     When(:bus) { Combi::ServiceBus.init_for(:queue, {init_queue: false}) }
     Then { Combi::Queue === bus }
@@ -23,19 +29,48 @@ describe 'Combi::Queue' do
       :frame_max => 131072
     }
   end
-  Given(:provider) { Combi::ServiceBus.init_for(:queue, { amqp_config: amqp_config } ) }
-  Given(:consumer) { Combi::ServiceBus.init_for(:queue, { amqp_config: amqp_config } ) }
+  Given(:provider) { Combi::ServiceBus.init_for(:queue, { amqp_config: amqp_config.merge(role: 'provider') } ) }
+  Given(:consumer) { Combi::ServiceBus.init_for(:queue, { amqp_config: amqp_config.merge(role: 'consumer') } ) }
   Given(:prepare) do
     provider.start!
     consumer.start!
     true
   end
 
-  it_behaves_like 'standard_bus' do
-    before(:all) do
-      RabbitmqServer.instance.stop! if ENV['CLEAN']
-      RabbitmqServer.instance.start!
+  it_behaves_like 'standard_bus'
+
+  Given(:null_service) do
+    Module.new do
+      def actions; [:null]; end
+      def do_it(params)
+        "null"
+      end
     end
-    after(:all) { RabbitmqServer.instance.stop! if ENV['CLEAN'] }
   end
+
+  context "it resist a reconnection" do
+    puts "VERY UNSTABLE TEST"
+    When(:service) { provider.add_service null_service }
+    Then do
+      em do
+        prepare
+        EM::add_timer(0.1) do
+          `killall ssh`
+        end
+        EM::add_timer(0.2) do
+          RabbitmqServer.instance.start_forwarder!
+        end
+        EM::add_timer(2) do
+          EM.synchrony do
+            service_result = EM::Synchrony.sync consumer.request(:null, :do_it, {}, { timeout: 2 })
+            service_result.should eq "null"
+            done
+            provider.stop!
+            consumer.stop!
+          end
+        end
+      end
+    end
+  end
+
 end

data/spec/support/rabbitmq_server.rb

@@ -45,7 +45,7 @@ class RabbitmqServer
     container_line = `docker ps | grep #{NAME}`
     port_match = container_line.match(/:([0-9]+)->5672/)
     if port_match
-      return port_match[1]
+      return port_match[1].to_i
     else
       puts "Container not running yet, sleeping"
       sleep 0.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combi
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - German Del Zotto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby