thrift-amqp 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0270649b7735d0880dd3695aafc62707714783ec
-  data.tar.gz: d10f20d8552673ebfca25eeedd581c92068131cc
+  metadata.gz: d6318490f0715d728203b16fdfe5e5162b1a85e6
+  data.tar.gz: c005959eb015dd4811315b16426e5873eb9a8600
 SHA512:
-  metadata.gz: d5207873985081cb001e4073df4e058bc821d85360027ddb226ea0bf81930144795ef60a33f6bd3f805a6dde57793531f33d5cca32f9c5ec8c6271e722d2687d
-  data.tar.gz: cd9ec8a8359d4320e20927831db2d1ad60e3da803f0aeda05f45b70071385476f3f6f58d84325b9e019d5ea73115f31a75b1753409b705681727dfcc6e6c6d8f
+  metadata.gz: 12fa7d536eea5b4d99cdc7943cd2ef0ffd0ab2a80028cafff744fddf439550f21da6b0adfbdd67d95c2ce9bd577c412c05d6b5f1daf5ff2053800cc16218310a
+  data.tar.gz: 57f1341ddb6ec62720ab6ed3268cfd760737d88863cc4162579fe33a0b7017964dff46bf5e4494e81bc91325793be27e57447603fcf9e90456a5b9e9b03fc2c9

data/lib/thrift/amqp/server.rb

@@ -1,6 +1,7 @@
 require 'bunny'
 require 'thrift'
 require 'logger'
+require 'timeout'
 
 LOGGER = Logger.new(STDOUT)
 LOGGER.level = Logger::INFO
@@ -17,6 +18,7 @@ module Thrift
       @routing_key = opts[:routing_key]
       @exchange_name = opts[:exchange_name]
       @prefetch = opts[:prefetch]
+      @timeout = opts[:timeout]
     end
 
     def handle(delivery_info, properties, payload)
@@ -38,8 +40,6 @@ module Thrift
       rescue => e
         LOGGER.error("Processor failure #{e}")
       end
-
-      @channel.acknowledge(delivery_info.delivery_tag, false)
     end
 
     def serve
@@ -60,7 +60,22 @@ module Thrift
           manual_ack: true,
           block: true
         ) do |delivery_info, properties, payload|
-          handle delivery_info, properties, payload
+          begin
+            if @timeout
+              begin
+                Timeout.timeout(@timeout) do
+                  handle(delivery_info, properties, payload)
+                end
+              rescue Timeout::TimeoutError
+                LOGGER.info("Timeout raised")
+              end
+            else
+              handle delivery_info, properties, payload
+            end
+          rescue => e
+            LOGGER.info("Error happened: #{e}")
+          end
+          @channel.acknowledge(delivery_info.delivery_tag, false)
         end
       end
     rescue Bunny::TCPConnectionFailedForAllHosts, Bunny::ConnectionClosedError

data/lib/thrift/amqp/version.rb

@@ -1,5 +1,5 @@
 module Thrift
   module AMQP
-      VERSION = "0.0.7"
+      VERSION = "0.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift-amqp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Alexis Montagne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler