thrift-amqp 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 654ead61ea5b16a491ecb1cee0b2a79151fc0c95
-  data.tar.gz: a7e3da74a7af5f15420f2e60c6817353948a09e1
+  metadata.gz: c52372806c20e8d70a228cf79074b45d4f71cec3
+  data.tar.gz: 42cde22f78924bab6d241179faf0c7e27f96e710
 SHA512:
-  metadata.gz: c34dc87542445c294ecc799704820704166dcfef58ffc39d95e8b8c7b43d2b014437c65c1ce8956db3a48edb0e1bc0d5624c42f90f45357be8c7666e6d2e908c
-  data.tar.gz: de834e7e6a1f99d2404330ee5033c756e45f09e13f5c8059691f3e5898d21777dc1c2ee8faff2235154eb976424e3c3ff56589b9a6bcfec2631ab412bd82fe44
+  metadata.gz: 7d4f43ec13ef61f936ea8a0f9a9ce14ae1e8b3227bdc93d7634ec59ec010871066d057ab643f03f4e542ec74ca02bba2ec9a1b36302fe866e6a8b254f77d3960
+  data.tar.gz: 265a92cf5c0cba2738ffcb6c678e9412c2441f6940d81faea7944f094ec8a23ccce4f8e74cdc6167a57c4c8ad7407ddad1a73f4643c19a6a8f9cae4464daf7be

data/lib/thrift/amqp/amqp_rpc_client.rb

@@ -0,0 +1,165 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+require 'thrift'
+require 'bunny'
+require 'stringio'
+require 'timeout'
+require 'uuidtools'
+
+module Thrift
+
+  class ResponseTimeout < Timeout::Error; end
+
+  class AmqpRpcClientTransport < BaseTransport
+
+    def initialize(service_queue_name, opts={})
+      @service_queue_name = service_queue_name
+      @outbuf = Bytes.empty_byte_buffer
+
+      if opts[:connection].nil?
+        if opts[:host].nil?
+          raise ArgumentError, ":host key not provided in opts dict to make connection"
+        end
+
+        if opts[:port].nil?
+          raise ArgumentError, ":port key not provided in opts dict to make connection"
+        end
+
+        vhost = opts[:vhost] || "/"
+        user = opts[:user] || "guest"
+        password = opts[:password] || "guest"
+        ssl = opts[:ssl] || false
+
+        @conn = Bunny.new(:host => opts[:host], :port => opts[:port], :vhost => vhost, :user => user, :password => password, :ssl=> ssl)
+
+        @conn.start
+        @connection_started = true
+      else
+        @conn = opts[:connection]
+        @connection_started = false
+      end
+
+      @from_name                 = opts[:from_name].nil? ? "Unknown Client" : opts[:from_name]
+      @exchange                  = opts[:exchange] || nil
+
+      @ch                        = @conn.create_channel
+      @service_exchange          = @exchange.nil? ? @ch.default_exchange : @ch.direct(@exchange)
+      @service_response_exchange = @ch.default_exchange
+      @reply_queue               = @ch.queue("", :exclusive => true)
+      @is_opened                 = true
+
+    end
+
+    def close
+      if @is_opened
+        @reply_queue.delete
+        @ch.close
+
+        if @connection_started
+          @conn.close
+          @connection_started = false
+        end
+
+        @is_opened = false
+      end
+    end
+
+    def open?; @is_opened end
+    def read(sz); @inbuf.read sz end
+    def write(buf); @outbuf << Bytes.force_binary_encoding(buf) end
+
+    #If blocking is set to true then wait for a response message in the reply_to queue, otherwise
+    #just send and go!
+    def flush(options={})
+
+      operation = options.has_key?(:operation) ? options[:operation] : ""
+      blocking = options.has_key?(:blocking) ? options[:blocking] : true
+      msg_timeout = options.has_key?(:msg_timeout) ? options[:msg_timeout] : 10
+      log_messages = options.has_key?(:log_messages) ? options[:log_messages] : false
+
+      correlation_id = self.generate_uuid
+
+      headers = {:service_name      => @service_queue_name,
+                 :operation         => operation,
+                 :response_required => blocking,   #Tell the receiver if a response is required
+                 :from_name         => @from_name
+      }
+
+      #Publish the message
+      print_log "Publishing message reply-to: #{@reply_queue.name} - headers: #{headers}", correlation_id if log_messages
+      start_time = Time.now
+      @service_exchange.publish(@outbuf,
+                                :routing_key    => @service_queue_name,
+                                :correlation_id => correlation_id,
+                                :expiration     => msg_timeout,
+                                :reply_to       => @reply_queue.name,
+                                :headers        => headers)
+
+      #If this is a standard RPC blocking call, then wait for there to be a response from the
+      #service provider or timeout and log the timeout
+      if blocking
+        @response = ""
+        begin
+          #Adding 1sec to timeout to account for clock differences
+          Timeout.timeout(msg_timeout + 1, ResponseTimeout) do
+            @reply_queue.subscribe(:block => true) do |delivery_info, properties, payload|
+
+              if log_messages
+                response_time = Time.now - start_time
+                print_log "---- Response Message received in #{response_time}sec for #{@reply_queue.name}", correlation_id
+                print_log "HEADERS: #{properties}", correlation_id
+              end
+
+              if properties[:correlation_id] == correlation_id
+                @response = payload
+
+                #once the return message has been received, no need to continue a subscription
+                delivery_info.consumer.cancel
+              end
+            end
+          end
+        rescue ResponseTimeout => ex
+          #Trying to work around weirdness being seen in a multi threaded workflow environment
+          if @response == ""
+            msg = "A timeout has occurred (#{msg_timeout}sec) trying to call #{@service_queue_name}.#{operation}"
+            print_log msg, correlation_id
+            raise ex, msg
+          else
+            print_log "Ignoring timeout - #{@response}", correlation_id
+          end
+        end
+        @inbuf = StringIO.new Bytes.force_binary_encoding(@response)
+      end
+      @outbuf = Bytes.empty_byte_buffer
+    end
+
+    protected
+
+    def generate_uuid
+      UUIDTools::UUID.timestamp_create.to_s
+    end
+
+    def print_log(message="", correlation_id="")
+      puts "#{Time.now.utc} C Thread: #{Thread.current.object_id} CID:#{correlation_id} - #{message}"
+    end
+  end
+end
+
+

data/lib/thrift/amqp/amqp_rpc_service.rb

@@ -0,0 +1,165 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+require 'bunny'
+require 'thrift'
+
+module Thrift
+  class AmqpRpcServer < BaseServer
+
+    class ProcessingTimeout < Timeout::Error; end
+
+    def initialize(processor, opts={})
+
+      @processor = processor
+
+      if opts[:connection].nil?
+
+        if opts[:host].nil?
+          raise ArgumentError, ":host key not provided in opts dict to make connection"
+        end
+
+        if opts[:port].nil?
+          raise ArgumentError, ":port key not provided in opts dict to make connection"
+        end
+
+        vhost = opts[:vhost] || "/"
+        user = opts[:user] || "guest"
+        password = opts[:password] || "guest"
+        ssl = opts[:ssl] || false
+
+        @conn = Bunny.new(:host => opts[:host], :port => opts[:port], :vhost => vhost, :user => user, :password => password, :ssl=> ssl)
+        @conn.start
+      else
+        @conn = opts[:connection]
+      end
+
+      #print "service:", @conn, "\n"
+
+      if not opts.has_key?(:queue_name)
+        raise ArgumentError, "A service queue name has not been specified"
+      end
+
+      @queue_name = opts[:queue_name]
+      @protocol_factory = opts[:protocol_factory] || BinaryProtocolFactory
+      @exchange = opts[:exchange] || nil
+
+    end
+
+    def close
+
+      if not @request_channel.nil? and @request_channel.respond_to?('close')
+        @request_channel.close
+      end
+
+      #Always close the broker connection when closing the server
+      @conn.close
+
+    end
+
+
+
+    def serve(options={})
+      log_messages = options[:log_messages] || false
+      max_messages = options[:max_messages].nil? ? 10 : options[:max_messages]
+      response_timeout = options[:response_timeout] || 10
+
+      #Create a channel to the service queue
+      @request_channel = @conn.create_channel(nil, max_messages )
+
+      if @exchange.nil?
+        @service_exchange = @request_channel.default_exchange
+        @request_queue = @request_channel.queue(@queue_name, :auto_delete => true)
+      else
+        @service_exchange = @request_channel.direct(@exchange,:durable => true)
+        @request_queue = @request_channel.queue(@queue_name, :auto_delete => true).bind(@service_exchange, :routing_key => @queue_name)
+      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 ----"
+          print_log "HEADERS: #{properties}"
+        end
+
+        Thread.current["correlation_id"] = properties.correlation_id
+
+        response_channel = @conn.create_channel
+        response_exchange = response_channel.default_exchange
+
+        response_required = 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
+
+          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
+
+            #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
+
+              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
+            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)
+
+        end
+
+        response_channel.close
+
+
+      end
+    end
+
+    private
+
+    def print_log(message="")
+      puts "#{Time.now.utc} S Thread: #{Thread.current.object_id} CID:#{Thread.current["correlation_id"]} - #{message}"
+
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Thrift
+  module Amqp
+    module Ruby
+      VERSION = "0.0.2"
+    end
+  end
+end

data/lib/thrift/amqp/ruby.rb

@@ -0,0 +1,10 @@
+require "thrift/amqp/ruby/version"
+require "thrift/amqp/amqp_rpc_client"
+require "thrift/amqp/amqp_rpc_service"
+
+module Thrift
+  module Amqp
+    module Ruby
+    end
+  end
+end

data/lib/thrift/amqp/server.rb

@@ -1,10 +1,13 @@
 require 'bunny'
 require 'thrift'
+require 'logger'
+
+LOGGER = Logger.new(STDOUT)
+LOGGER.level = Logger::INFO
 
 module Thrift
   class AMQPServer < BaseServer
-    def initialize(processor, iprot_factory, oprot_factory=nil, opts={})
-
+    def initialize(processor, iprot_factory, oprot_factory = nil, opts = {})
       @processor = processor
       @iprot_factory = iprot_factory
       @oprot_factory = oprot_factory || iprot_factory
@@ -28,22 +31,19 @@ module Thrift
 
       @channel.prefetch @prefetch
 
-      queue.subscribe(block: false) do |delivery_info, properties, payload|
+      queue.subscribe(
+        manual_ack: true,
+        block: true
+      ) do |delivery_info, _properties, payload|
         trans = MemoryBufferTransport.new(payload)
         iprot = @iprot_factory.get_protocol(trans)
 
-        @processor.process(iprot, nil)
-
-        @channel.acknowledge(delivery_info.delivery_tag, false)
-      end
-
-      loop do
-        sleep 5
-
-        if @channel.open?
-          @channel.close
-          @channel.open
+        begin
+          @processor.process(iprot, nil)
+        rescue => e
+          LOGGER.error("Processor failure #{e}")
         end
+        @channel.acknowledge(delivery_info.delivery_tag, false)
       end
     end
   end

data/lib/thrift/amqp/version.rb

@@ -1,5 +1,5 @@
 module Thrift
   module AMQP
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrift-amqp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexis Montagne
@@ -94,7 +94,11 @@ files:
 - README.md
 - Rakefile
 - lib/thrift/amqp.rb
+- lib/thrift/amqp/amqp_rpc_client.rb
+- lib/thrift/amqp/amqp_rpc_service.rb
 - lib/thrift/amqp/client.rb
+- lib/thrift/amqp/ruby.rb
+- lib/thrift/amqp/ruby/version.rb
 - lib/thrift/amqp/server.rb
 - lib/thrift/amqp/version.rb
 - thrift-amqp.gemspec
@@ -118,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Thrift transport layer over AMQP