vx-common-amqp 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78c7ba1237547a68870877cf97e753e060e409a8
-  data.tar.gz: b176e9a6819bca67fc9244da4fec6186ef6ca94e
+  metadata.gz: 16f3b92f0f5a953fcc9200b6704396461c8be8db
+  data.tar.gz: a411d13c2d1112634ccf107f7c00d334c098f9cc
 SHA512:
-  metadata.gz: 5b71ffdcc44ec306ba4fdde80ae3f76df4cc708429a89651a7c7508f7dfb9439ea6280c426cc612a88dee7a04bd07e78ee0b69e1ec55c62b87c46deef5095816
-  data.tar.gz: f3f3d0af052ef31fc59c39c12ee69453a5676c961c82814074fa8bd966d6c19dd50017a3e9c07c31ae586529d0a82ec277afa25648fee5f1b1b090662c6977c6
+  metadata.gz: b78866acd40c7871893af4e4bb058aeddacc32b7538f5c935ad0070e1cdd59e35ab96ca42eb34450711594ab92e68dd8f3fc23b5e8a5241993d5de4cd08f5002
+  data.tar.gz: e5d25fc001a9dfb0a20b9b2cbd56b9df593dfafb89700e96282b9fce6a18d46a9b50f015519cb15fefe2efa0963112dd8ea0b00cf8e05f7275554a6e89d407c1

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

@@ -1,4 +1,3 @@
-require 'logger'
 require 'vx/common/rack/builder'
 
 module Vx
@@ -7,8 +6,9 @@ module Vx
       class Config
 
         attr_accessor :default_exchange_options, :default_queue_options,
-          :default_publish_options, :default_exchange_type, :logger, :pool_timeout,
-          :heartbeat, :spawn_attempts, :content_type, :instrumenter, :debug, :on_error
+          :default_publish_options, :default_exchange_type, :pool_timeout,
+          :heartbeat, :spawn_attempts, :content_type, :instrumenter, :debug,
+          :on_error, :builder
 
         def initialize
           reset!
@@ -26,8 +26,11 @@ module Vx
           @debug || ENV['VX_COMMON_AMQP_DEBUG']
         end
 
+        def use(middleware, *args)
+          @builder.use middleware, *args
+        end
+
         def reset!
-          @logger                = ::Logger.new(STDOUT)
           @default_exchange_type = :topic
           @pool_timeout          = 0.1
           @heartbeat             = 10
@@ -44,6 +47,8 @@ module Vx
           @instrumenter          = nil
           @on_error              = ->(e, env){ nil }
 
+          @builder               = Vx::Common::Rack::Builder.new
+
           @default_exchange_options = {
             durable:     true,
             auto_delete: false

data/lib/vx/common/amqp/consumer/ack.rb

@@ -7,7 +7,7 @@ module Vx
           instrumentation = {
             consumer_id:   self.class.consumer_id,
             consumer:      self.class.consumer_name,
-            message_id:    properties[:message_id],
+            properties:    properties,
             multiple:      multiple,
           }
           self.class.session.channel.ack delivery_info.delivery_tag, multiple
@@ -18,7 +18,7 @@ module Vx
           instrumentation = {
             consumer_id:   self.class.consumer_id,
             consumer:      self.class.consumer_name,
-            message_id:    properties[:message_id],
+            properties:    properties,
             multiple:      multiple,
             requeue:       requeue,
           }

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

@@ -21,7 +21,7 @@ module Vx
             exchange:    x.name,
             consumer:    consumer_name,
             consumer_id: consumer_id,
-            message_id:  options[:message_id]
+            properties:  options,
           }
 
           instrument("process_publishing.consumer.amqp", instrumentation) do

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

@@ -64,10 +64,10 @@ module Vx
                   consumer_id:   consumer_id,
                   consumer:      consumer_name,
                   payload:       payload,
-                  message_id:    properties[:message_id]
+                  properties:    properties,
                 }
 
-                Instrument.with request_id: uuid do
+                with_middlewares instrumentation do
                   instrument("start_processing.consumer.amqp", instrumentation)
                   instrument("process.consumer.amqp", instrumentation) do
                     result  = run_instance delivery_info, properties, payload, uuid
@@ -89,6 +89,10 @@ module Vx
             end.perform payload
           end
 
+          def with_middlewares(env, &block)
+            Common::AMQP.config.builder.to_app(block).call(env)
+          end
+
           def deserialize_message(properties, payload)
             Common::AMQP::Formatter.unpack(
               properties[:content_type],

data/lib/vx/common/amqp/mixins/instrument.rb

@@ -3,20 +3,8 @@ module Vx
     module AMQP
       module Instrument
 
-        def self.with(new_params)
-          old_params = Thread.current["vx_common_amqp_instrument_with"]
-          begin
-            Thread.current["vx_common_amqp_instrument_with"] = new_params
-            yield if block_given?
-          ensure
-            Thread.current["vx_common_amqp_instrument_with"] = old_params
-          end
-        end
-
         def instrument(name, payload, &block)
-          append = Thread.current["vx_common_amqp_instrument_with"]
-          append ||= {}
-          Common::AMQP.instrument name, payload.merge(append), &block
+          Common::AMQP.instrument name, payload, &block
         end
 
       end

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

@@ -1,7 +1,7 @@
 module Vx
   module Common
     module AMQP
-      VERSION = "0.3.4"
+      VERSION = "0.3.5"
     end
   end
 end

data/spec/lib/amqp/config_spec.rb

@@ -3,4 +3,16 @@ require 'spec_helper'
 describe Vx::Common::AMQP::Config do
   let(:config) { described_class.new }
 
+  it "should use builder" do
+    mid = Struct.new(:app) do
+      def call(env)
+        env.merge!(a: 1)
+      end
+    end
+
+    config.use mid
+    rs = config.builder.to_app(->(e) { e }).call({})
+    expect(rs).to eq(a: 1)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-common-amqp
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny