evrone-common-amqp 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7026b69a2227f3adc9eef4d6cfd39ff0ec764ce
-  data.tar.gz: 8811dd3fd48a5e75384d7491334e3ba7db904f8a
+  metadata.gz: f645ca2a91df21cc2f73e78619c0a6e156a8a9e9
+  data.tar.gz: 0c98ff77f1a9b95f04b5ee38a571b98d9c45964f
 SHA512:
-  metadata.gz: 03a5921a1d9b900c30a4448caef99e68c6ecbd508f23cbe4422bb6e7c185d680bad891d92b64102f29ae95f77d2934e9219229fee75ba0ee386f2669262cbefa
-  data.tar.gz: 90b0697c2a69f25e70e5719b500f66566c9ac41e6bc8101d8dc01d7ca08b2c104d94c060440869990ac3ba80467adc8b7760b1e1edcf4289b92a45e9cd0a1da1
+  metadata.gz: 724917e1aa65f511de5680fcd4b247097ca2ea9941bef1666d00d68b5d1338d0e5f036ac8b0d1eabb38f17d037591f8dc8b8a4019ef73281934da93f10a85aa2
+  data.tar.gz: b1c678749a8d5b3446df0a9e8c5d9d76252d8a073e946d597b1a1a2e549eb731edaf5081aa5497a158b42b235ed547e0e45da48289ee2d071900d20f9c140680

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
 - 2.0.0
 - jruby-19mode
 
+
 services:
 - rabbitmq
 

data/evrone-common-amqp.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_runtime_dependency "bunny",     ">= 1.0.0.pre6"
+  spec.add_runtime_dependency "bunny",     ">= 1.0.0.rc2"
   spec.add_runtime_dependency "evrone-common-rack-builder"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/evrone/common/amqp/config.rb

@@ -26,6 +26,10 @@ module Evrone
           end
         end
 
+        def on_error(&block)
+          callbacks[:on_error] = block
+        end
+
         def default_exchange_name
           "amq.#{default_exchange_type}"
         end

data/lib/evrone/common/amqp/consumer.rb

@@ -29,15 +29,6 @@ module Evrone
           @@classes
         end
 
-        def consumer_name
-          @consumer_name ||= begin
-            id = Thread.current[:consumer_id]
-            name = self.class.consumer_name.dup
-            name << ".#{id}" if id
-            name
-          end
-        end
-
         module ClassMethods
 
           include Common::AMQP::Consumer::Configuration

data/lib/evrone/common/amqp/consumer/configuration.rb

@@ -77,6 +77,14 @@ module Evrone
           consumer_configuration.consumer_name
         end
 
+        def consumer_id
+          if cid = Thread.current[:evrone_amqp_consumer_id]
+            "#{consumer_name}.#{cid}"
+          else
+            consumer_name
+          end
+        end
+
         def bind_options
           consumer_configuration.bind_options ||
             @@consumer_configuration_lock.synchronize do

data/lib/evrone/common/amqp/consumer/publish.rb

@@ -13,7 +13,7 @@ module Evrone
 
           x = declare_exchange
 
-          run_callbacks(:publish, message: message, exchange: x, name: consumer_name) do
+          run_callbacks(:publish, message: message, exchange: x, name: consumer_id) do
             m = serialize_message message, options[:content_type]
             x.publish m, options
           end

data/lib/evrone/common/amqp/consumer/subscribe.rb

@@ -10,7 +10,7 @@ module Evrone
             x = declare_exchange
             q = declare_queue
 
-            run_callbacks(:subscribe, exchange: x, queue: q, name: consumer_name) do
+            run_callbacks(:subscribe, exchange: x, queue: q, name: consumer_id) do
               debug "subscribing to #{q.name}:#{x.name} using #{bind_options.inspect}"
               q.bind(x, bind_options)
               debug "successfuly subscribed to #{q.name}:#{x.name}"
@@ -47,7 +47,7 @@ module Evrone
           def run_instance(delivery_info, properties, payload)
             payload = deserialize_message properties, payload
 
-            run_callbacks :recieve, payload: payload, name: consumer_name do
+            run_callbacks :recieve, payload: payload, name: consumer_id do
               new.tap do |inst|
                 inst.properties    = properties
                 inst.delivery_info = delivery_info

data/lib/evrone/common/amqp/mixins/callbacks.rb

@@ -19,6 +19,16 @@ module Evrone
           rs
         end
 
+        def run_on_error_callback(e)
+          if f = Common::AMQP.config.callbacks[:on_error]
+            begin
+              f.call e
+            rescue Exception => e
+              $stderr.puts "ERROR on error callback: #{e.inspect}"
+            end
+          end
+        end
+
       end
     end
   end

data/lib/evrone/common/amqp/supervisor/threaded.rb

@@ -6,6 +6,7 @@ module Evrone
       class Supervisor::Threaded
 
         include Common::AMQP::Logger
+        include Common::AMQP::Callbacks
 
         POOL_INTERVAL = 0.5
 
@@ -128,8 +129,7 @@ module Evrone
             attempt = 0 if reset_attempt?(task)
             task.dup.tap do |new_task|
               new_task.thread = Thread.new(new_task) do |t|
-                Thread.current[:consumer_id] = t.id
-                Thread.current[:consumer_name] = t.object.to_s
+                Thread.current[:evrone_amqp_consumer_id] = t.id
                 t.object.send t.method
               end
               new_task.thread.abort_on_exception = false
@@ -149,6 +149,7 @@ module Evrone
             rescue Exception => e
               STDERR.puts "#{e.inspect} in #{task.inspect}"
               STDERR.puts e.backtrace.join("\n")
+              run_on_error_callback(e)
               e
             end
           end

data/lib/evrone/common/amqp/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module Common
     module AMQP
-      VERSION = "0.2.2"
+      VERSION = "0.2.3"
     end
   end
 end

data/spec/integration/multi_threaded_spec.rb

@@ -52,10 +52,16 @@ describe "Run in multithread environment", slow: true, jruby: true do
     ths = (0..12).map do |i|
       klass = (i % 2 == 0) ? alice : bob
       Thread.new do
-        klass.subscribe
+        begin
+          klass.subscribe
+        rescue Exception => e
+          puts "ERROR: #{e.inspect}"
+          raise e
+        end
+      end.tap do |th|
+        th.abort_on_exception = true
       end
     end
-    ths.each{|t| t.abort_on_exception = true }
     sleep 0.5
 
     num_messages.times do |n|

data/spec/lib/amqp/config_spec.rb

@@ -17,5 +17,16 @@ describe Evrone::Common::AMQP::Config do
         end
       end
     end
+
+    context "on_error" do
+      it "should be success" do
+        config.on_error do |e|
+          e
+        end
+        val = config.callbacks[:on_error].call "value"
+        expect(val).to eq 'value'
+      end
+    end
   end
+
 end

data/spec/lib/amqp/consumer_spec.rb

@@ -32,16 +32,15 @@ describe Evrone::Common::AMQP::Consumer do
     its(:config)        { should be_an_instance_of(Evrone::Common::AMQP::Config) }
     its(:consumer_name) { should eq 'test_consumer' }
 
-    context "instance consumer_name" do
-      subject { consumer.consumer_name }
+    context "consumer_id" do
 
-      it { should eq 'test_consumer' }
-
-      context "when Thread.current has key :consumer_id" do
-        before do
-          mock(Thread.current).[](:consumer_id){ '99' }
+      it "should be success" do
+        expect(consumer_class.consumer_id).to eq 'test_consumer'
+        th = Thread.new do
+          Thread.current[:evrone_amqp_consumer_id] = '99'
+          consumer_class.consumer_id
         end
-        it { should eq 'test_consumer.99' }
+        expect(th.value).to eq 'test_consumer.99'
       end
     end
 

data/spec/lib/amqp/supervisor/threaded_spec.rb

@@ -29,7 +29,7 @@ describe Evrone::Common::AMQP::Supervisor::Threaded, jruby: true do
     let(:len)       { 1 }
     let(:runner)    {
       Proc.new do
-        id = Thread.current[:consumer_id]
+        id = Thread.current[:evrone_amqp_consumer_id]
         mutex.synchronize do
           collected.push id
         end
@@ -73,7 +73,7 @@ describe Evrone::Common::AMQP::Supervisor::Threaded, jruby: true do
       let(:runner) {
         Proc.new do
           sleep 0.1
-          id = Thread.current[:consumer_id]
+          id = Thread.current[:evrone_amqp_consumer_id]
           mutex.synchronize do
             collected.push id
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evrone-common-amqp
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre6
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre6
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: evrone-common-rack-builder
   requirement: !ruby/object:Gem::Requirement