waterdrop 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9078e08b7d8417a1a7a25dec1a720d8e4c695e2
-  data.tar.gz: f0cb1d1745665a2cc2281f289ebf5c7672fa9b77
+  metadata.gz: 4c194065166002b613a559ba2818edc33edea127
+  data.tar.gz: ca654d85779ccefd488269360a977db8e3406f54
 SHA512:
-  metadata.gz: eb25c8240e32e82ef5c8621900c46ba91aea522e5b1e3c0e743d070b8ebfece12020cff2e5e53ceebb2a49dfb23096940b95fef5cd0f09d3f19f938477ea43a8
-  data.tar.gz: a76dfe91b91a00bb23b0d7abed94a86f077d5aacce7346e49cae7b2c6b99d0d37cdedb1938a453a97cf06a3fe23735cfd40430b5289800277d1b8590887c7b66
+  metadata.gz: dee9f25037979516a0f5d62591e4cce4706a2f54b10862e63bc0ea757664f6dc7b442efb501f70e9eafe0b1ec9d6389be0f9b74968369faeefa69ad1adf864d4
+  data.tar.gz: da09ca5c22c4553e0c6f82fb16a7761bf97453c8f6ac8a3713ac350f09ffe69f47150912a48f4c2574b9bdacc6197d9ad445dff2ee4c030a082035e5c8ef33b1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # WaterDrop changelog
 
+## 1.0.1
+- Added high level retry on connection problems
+
 ## 1.0.0
 
 - #37 - ack level for producer

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waterdrop (1.0.0.alpha2)
+    waterdrop (1.0.1)
       delivery_boy (>= 0.2.2)
       dry-configurable (~> 0.7)
       dry-validation (~> 0.11)
@@ -22,14 +22,14 @@ GEM
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.0)
+    dry-core (0.4.1)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.0)
     dry-logic (0.4.2)
       dry-container (~> 0.2, >= 0.2.6)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-types (0.12.1)
+    dry-types (0.12.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1)
       dry-container (~> 0.3)

data/README.md

@@ -89,9 +89,7 @@ To send Kafka messages, just use one of the producers:
 
 ```ruby
 WaterDrop::SyncProducer.call('message', topic: 'my-topic')
-
 # or for async
-
 WaterDrop::AsyncProducer.call('message', topic: 'my-topic')
 ```
 
@@ -99,7 +97,7 @@ Both ```SyncProducer``` and ```AsyncProducer``` accept following options:
 
 | Option              | Required | Value type     | Description                                                         |
 |-------------------- |----------|----------------|---------------------------------------------------------------------|
-| ```topic```         | true     | String, Symbol | The Kafka topic that should be written to                           |
+| ```topic```         | true     | String         | The Kafka topic that should be written to                           |
 | ```key```           | false    | String         | The key that should be set on the Kafka message                     |
 | ```partition```     | false    | Integer        | A specific partition number that should be written to               |
 | ```partition_key``` | false    | String         | A string that can be used to deterministically select the partition |

data/lib/water_drop/async_producer.rb

@@ -3,6 +3,27 @@
 # WaterDrop library
 module WaterDrop
   # Async producer for messages
-  AsyncProducer = Class.new(BaseProducer)
-  AsyncProducer.method_name = :deliver_async
+  class AsyncProducer < BaseProducer
+    # Performs message delivery using deliver_async method
+    # @param message [String] message that we want to send to Kafka
+    # @param options [Hash] options (including topic) for producer
+    # @raise [WaterDrop::Errors::InvalidMessageOptions] raised when message options are
+    #   somehow invalid and we cannot perform delivery because of that
+    def self.call(message, options)
+      attempts ||= 0
+      attempts += 1
+
+      validate!(options)
+      return unless WaterDrop.config.deliver
+      DeliveryBoy.deliver_async(message, options)
+    rescue Kafka::Error => e
+      if attempts > WaterDrop.config.kafka.max_retries
+        WaterDrop.logger.error e
+        raise e
+      else
+        WaterDrop.logger.warn "Retrying delivery after: #{e}"
+        retry
+      end
+    end
+  end
 end

data/lib/water_drop/base_producer.rb

@@ -5,20 +5,6 @@ module WaterDrop
   # sync and async producers
   class BaseProducer
     class << self
-      # Delivery boy method name that we use to invoke producer action
-      attr_accessor :method_name
-
-      # Performs message delivery using method_name method
-      # @param message [String] message that we want to send to Kafka
-      # @param options [Hash] options (including topic) for producer
-      # @raise [WaterDrop::Errors::InvalidMessageOptions] raised when message options are
-      #   somehow invalid and we cannot perform delivery because of that
-      def call(message, options)
-        validate!(options)
-        return unless WaterDrop.config.deliver
-        DeliveryBoy.public_send(method_name, message, options)
-      end
-
       private
 
       # Runs the message options validations and raises an error if anything is invalid

data/lib/water_drop/sync_producer.rb

@@ -3,6 +3,27 @@
 # WaterDrop library
 module WaterDrop
   # Sync producer for messages
-  SyncProducer = Class.new(BaseProducer)
-  SyncProducer.method_name = :deliver
+  class SyncProducer < BaseProducer
+    # Performs message delivery using deliver_async method
+    # @param message [String] message that we want to send to Kafka
+    # @param options [Hash] options (including topic) for producer
+    # @raise [WaterDrop::Errors::InvalidMessageOptions] raised when message options are
+    #   somehow invalid and we cannot perform delivery because of that
+    def self.call(message, options)
+      attempts ||= 0
+      attempts += 1
+
+      validate!(options)
+      return unless WaterDrop.config.deliver
+      DeliveryBoy.deliver(message, options)
+    rescue Kafka::Error => e
+      if attempts > WaterDrop.config.kafka.max_retries
+        WaterDrop.logger.error e
+        raise e
+      else
+        WaterDrop.logger.warn "Retrying delivery after: #{e}"
+        retry
+      end
+    end
+  end
 end

data/lib/water_drop/version.rb

@@ -3,5 +3,5 @@
 # WaterDrop library
 module WaterDrop
   # Current WaterDrop version
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Maciej Mensfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delivery_boy