thrift-amqp-ruby 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47b60f6d88a19c39352bd0173213c238299e01c6
-  data.tar.gz: 96733bf92ae83b43a9da73b7a449f6c33c7e6aff
+  metadata.gz: a08eb85188e4dbe1d3d589d01e1751b574b1a030
+  data.tar.gz: a4f2f66643307e2d79fcfc94967dd9366cd0e3b2
 SHA512:
-  metadata.gz: 6b76ebc19ab8fe491c572f6d95fca291ea1f7592474c596ae7e3dcbf58b74b378ff766a0a7d9fa8fb8eace1fe6389a46ce75b8bf47b761a6ce191475b5241742
-  data.tar.gz: 651f7479ecc599907ded1610d25c8087281552ab747cb72601a637128c88f037b861eb83876e55d334e8fd582fe194869fc1a2ea4f2855bbd816f7a59ec84536
+  metadata.gz: e1025b4a46fa9cdd74dfe4eb0debe4f5551d053aa0703b4d4ce45423010f006c65894f7f1f9e5016970d3b3534178bc16f88ad3b8d463a20f31dfa10f1e2c760
+  data.tar.gz: 18809b8df1d68812b700c5076c1584eafd8bce4cad2ba21715563027eb4edd4381231c6fd42ab10343112c7f8dec0a13b029ea2dd4e8d38e81b1078a2c33edda

data/lib/thrift/amqp/amqp_rpc_client.rb

@@ -60,7 +60,7 @@ module Thrift
       @exchange                  = opts[:exchange] || nil
 
       @ch                        = @conn.create_channel
-      @service_exchange          = @exchange.nil? ? @ch.default_exchange : @ch.direct(@exchange, :durable => true)
+      @service_exchange          = @exchange.nil? ? @ch.default_exchange : @ch.direct(@exchange, no_declare: true)
       @service_response_exchange = @ch.default_exchange
       @reply_queue               = @ch.queue("", :exclusive => true)
       @is_opened                 = true

data/lib/thrift/amqp/amqp_rpc_service.rb

@@ -92,7 +92,6 @@ module Thrift
       end
 
       @request_queue.subscribe(:block => true) do |delivery_info, properties, payload|
-
         if log_messages
           Thread.current["correlation_id"] = properties.correlation_id
           print_log "---- Message received ----"
@@ -104,49 +103,40 @@ module Thrift
         response_channel = @conn.create_channel
         response_exchange = response_channel.default_exchange
 
-        response_required = properties.headers.has_key?('response_required') ? properties.headers['response_required'] : true
+        response_required = (properties.headers && properties.headers.has_key?('response_required')) ? properties.headers['response_required'] : true
         process_timeout = response_timeout.to_i > properties.expiration.to_i ? response_timeout.to_i : properties.expiration.to_i
 
-        #Binary content will imply thrift based message payload
-        if properties.content_type == 'application/octet-stream'
 
-          print_log "Request to process #{@queue_name}.#{properties.headers['operation']} in #{process_timeout}sec" if log_messages
+        print_log "Request to process #{@queue_name}.#{properties.headers['operation']} in #{process_timeout}sec" if log_messages
 
-          input = StringIO.new payload
-          out = StringIO.new
-          transport = IOStreamTransport.new input, out
-          protocol = @protocol_factory.new.get_protocol transport
+        input = StringIO.new payload
+        out = StringIO.new
+        transport = IOStreamTransport.new input, out
+        protocol = @protocol_factory.new.get_protocol transport
 
-          begin
-            start_time = Time.now
-            Timeout.timeout(process_timeout, ProcessingTimeout) do
-              @processor.process protocol, protocol
-            end
-            processing_time = Time.now - start_time
+        begin
+          start_time = Time.now
+          Timeout.timeout(process_timeout, ProcessingTimeout) do
+            @processor.process protocol, protocol
+          end
+          processing_time = Time.now - start_time
 
-            #rewind the buffer for reading
-            if out.length > 0
-              out.rewind
+          #rewind the buffer for reading
+          if out.length > 0
+            out.rewind
 
-              print_log "Time to process request: #{processing_time}sec  Response length: #{out.length}"   if log_messages
+            print_log "Time to process request: #{processing_time}sec  Response length: #{out.length}"   if log_messages
 
-              if response_required
-                response_exchange.publish(out.read(out.length),
-                                          :routing_key => properties.reply_to,
-                                          :correlation_id => properties.correlation_id,
-                                          :content_type => 'application/octet-stream' )
-              end
+            if response_required
+              response_exchange.publish(out.read(out.length),
+                                        :routing_key => properties.reply_to,
+                                        :correlation_id => properties.correlation_id,
+                                        :content_type => 'application/octet-stream' )
             end
-
-          rescue ProcessingTimeout => ex
-            print_log "A timeout has occurred (#{process_timeout}sec) trying to call #{@queue_name}.#{properties.headers['operation']}"
           end
 
-        else
-
-          print_log "Unable to process message content of type #{properties.content_type}. The message will be rejected"
-          @request_channel.reject(delivery_info.delivery_tag, false)
-
+        rescue ProcessingTimeout => ex
+          print_log "A timeout has occurred (#{process_timeout}sec) trying to call #{@queue_name}.#{properties.headers['operation']}"
         end
 
         response_channel.close

data/lib/thrift/amqp/ruby/version.rb

@@ -1,7 +1,7 @@
 module Thrift
   module Amqp
     module Ruby
-      VERSION = "0.0.1"
+      VERSION = "0.0.3"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift-amqp-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Alexis Montagne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler