rdkafka 0.1.2 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: befdc0d1b36b36c452e380b639e0fa02636e9d0b
-  data.tar.gz: 5e18316623374fb32876dae52de52a5a99fab49b
+  metadata.gz: a9b016b16ea543f75f53572f0a16e89aae152000
+  data.tar.gz: ea73ee4d951be90743901a7b9e2fe75708823ebb
 SHA512:
-  metadata.gz: b100c399dee2eae775f78eb4dd8efd90cdc747d6cf88979ac6f5834e5e2f081f902b5591225a4270cfb74bcdc5b7098ac7da74b978c80d8fae761c6fe623dcc2
-  data.tar.gz: 993a439bb4883b25aff235b87c73fc4ac5993b2e076b414e50e6bc4947ef0d8d8e29b0a16d780d1e8697a845fff664fa002075aebec13ff8cfd3bacf11ea13d2
+  metadata.gz: 75f6817837f86d3b136a98fe87850bb63275bc389a5bdb7abfb8dd3dfd14633a73ac0073a26cd98d596b63901bf3796e4ec87f6e4c2c25320328f250fd960308
+  data.tar.gz: 7cac0e27475bd2571e6eb104fcaf977efed4e306b04cd8c735b2c390d119eff0f2538eced0a06f66c90c36d60ecc5e569b8bd77fe7f01e4c38ca40eaba960fda

data/.gitignore

@@ -1,4 +1,5 @@
 Gemfile.lock
 ext/ports
 ext/tmp
+ext/librdkafka.*
 *.gem

data/ext/Rakefile

@@ -2,14 +2,30 @@ require File.expand_path('../../lib/rdkafka/version', __FILE__)
 require "mini_portile2"
 require "fileutils"
 
-task :default do
+task :default => :clean do
+  # Download and compile librdkafka
   recipe = MiniPortile.new("librdkafka", Rdkafka::LIBRDKAFKA_VERSION)
   recipe.files = ["https://github.com/edenhill/librdkafka/archive/v#{Rdkafka::LIBRDKAFKA_VERSION}.tar.gz"]
   recipe.configure_options = ["--host=#{recipe.host}"]
   recipe.cook
+  # Move dynamic library we're interested in
+  if recipe.host.include?('darwin')
+    from_extension = '1.dylib'
+    to_extension   = 'dylib'
+  else
+    from_extension = 'so.1'
+    to_extension = 'so'
+  end
+  lib_path = File.join(File.dirname(__FILE__), "ports/#{recipe.host}/librdkafka/#{Rdkafka::LIBRDKAFKA_VERSION}/lib/librdkafka.#{from_extension}")
+  FileUtils.mv(lib_path, File.join(File.dirname(__FILE__), "librdkafka.#{to_extension}"))
+  # Cleanup files created by miniportile we don't need in the gem
+  FileUtils.rm_rf File.join(File.dirname(__FILE__), "tmp")
+  FileUtils.rm_rf File.join(File.dirname(__FILE__), "ports")
 end
 
 task :clean do
-  FileUtils.rm_rf "ports"
-  FileUtils.rm_rf "tmp"
+  FileUtils.rm_f File.join(File.dirname(__FILE__), "librdkafka.dylib")
+  FileUtils.rm_f File.join(File.dirname(__FILE__), "librdkafka.so")
+  FileUtils.rm_rf File.join(File.dirname(__FILE__), "ports")
+  FileUtils.rm_rf File.join(File.dirname(__FILE__), "tmp")
 end

data/lib/rdkafka/config.rb

@@ -1,5 +1,17 @@
+require "logger"
+
 module Rdkafka
   class Config
+    @@logger = Logger.new(STDOUT)
+
+    def self.logger
+      @@logger
+    end
+
+    def self.logger=(logger)
+      @@logger=logger
+    end
+
     DEFAULT_CONFIG = {
       :"api.version.request" => true
     }
@@ -39,23 +51,22 @@ module Rdkafka
     # This method is only intented to be used to create a client,
     # using it in another way will leak memory.
     def native_config
-      config = Rdkafka::FFI.rd_kafka_conf_new
-
-      @config_hash.each do |key, value|
-        error_buffer = ::FFI::MemoryPointer.from_string(" " * 256)
-        result = Rdkafka::FFI.rd_kafka_conf_set(
-          config,
-          key.to_s,
-          value.to_s,
-          error_buffer,
-          256
-        )
-        unless result == :config_ok
-          raise ConfigError.new(error_buffer.read_string)
+      Rdkafka::FFI.rd_kafka_conf_new.tap do |config|
+        @config_hash.each do |key, value|
+          error_buffer = ::FFI::MemoryPointer.from_string(" " * 256)
+          result = Rdkafka::FFI.rd_kafka_conf_set(
+            config,
+            key.to_s,
+            value.to_s,
+            error_buffer,
+            256
+          )
+          unless result == :config_ok
+            raise ConfigError.new(error_buffer.read_string)
+          end
         end
+        Rdkafka::FFI.rd_kafka_conf_set_log_cb(config, Rdkafka::FFI::LogCallback)
       end
-
-      config
     end
 
     def native_kafka(config, type)

data/lib/rdkafka/ffi.rb

@@ -1,10 +1,19 @@
 require "ffi"
-require "mini_portile2"
+require "logger"
 
 module Rdkafka
   module FFI
     extend ::FFI::Library
-    ffi_lib File.join(File.dirname(__FILE__), "../../ext/ports/#{MiniPortile.new("librdkafka", Rdkafka::LIBRDKAFKA_VERSION).host}/librdkafka/#{Rdkafka::LIBRDKAFKA_VERSION}/lib/librdkafka.dylib")
+
+    def self.lib_extension
+      if Gem::Platform.local.os.include?("darwin")
+        'dylib'
+      else
+        'so'
+      end
+    end
+
+    ffi_lib File.join(File.dirname(__FILE__), "../../ext/librdkafka.#{lib_extension}")
 
     # Polling
 
@@ -27,6 +36,10 @@ module Rdkafka
         self[:err]
       end
 
+      def topic
+        FFI.rd_kafka_topic_name(self[:rkt])
+      end
+
       def partition
         self[:partition]
       end
@@ -52,7 +65,7 @@ module Rdkafka
       end
 
       def to_s
-        "Message with key '#{key}', payload '#{payload}', partition '#{partition}', offset '#{offset}'"
+        "Message in '#{topic}' with key '#{key}', payload '#{payload}', partition '#{partition}', offset '#{offset}'"
       end
 
       def self.release(ptr)
@@ -61,6 +74,7 @@ module Rdkafka
     end
 
     attach_function :rd_kafka_message_destroy, [:pointer], :void
+    attach_function :rd_kafka_topic_name, [:pointer], :string
 
     # TopicPartition ad TopicPartitionList structs
 
@@ -100,6 +114,26 @@ module Rdkafka
 
     attach_function :rd_kafka_conf_new, [], :pointer
     attach_function :rd_kafka_conf_set, [:pointer, :string, :string, :pointer, :int], :kafka_config_response
+    callback :log_cb, [:pointer, :int, :string, :string], :void
+    attach_function :rd_kafka_conf_set_log_cb, [:pointer, :log_cb], :void
+
+    LogCallback = Proc.new do |client_ptr, level, level_string, line|
+      severity = case level
+                 when 0 || 1 || 2
+                   Logger::FATAL
+                 when 3
+                   Logger::ERROR
+                 when 4
+                   Logger::WARN
+                 when 5 || 6
+                   Logger::INFO
+                 when 7
+                   Logger::DEBUG
+                 else
+                   Logger::UNKNOWN
+                 end
+      Rdkafka::Config.logger.add(severity) { line }
+    end
 
     # Handle
 

data/lib/rdkafka/producer.rb

@@ -62,6 +62,8 @@ module Rdkafka
     end
   end
 
+  class WaitTimeoutError < RuntimeError; end
+
   class DeliveryHandle < ::FFI::Struct
     layout :pending, :bool,
            :response, :int,
@@ -73,10 +75,18 @@ module Rdkafka
     end
 
     # Wait for the delivery report
-    def wait
+    def wait(timeout_in_seconds=10)
+      timeout = if timeout_in_seconds
+                  Time.now.to_i + timeout_in_seconds
+                else
+                  nil
+                end
       loop do
         if pending?
-          sleep 0.05
+          if timeout && timeout <= Time.now.to_i
+            raise WaitTimeoutError.new("Waiting for delivery timed out after #{timeout_in_seconds} seconds")
+          end
+          sleep 0.1
           next
         elsif self[:response] != 0
           raise RdkafkaError.new(self[:response])

data/lib/rdkafka/version.rb

@@ -1,4 +1,4 @@
 module Rdkafka
-  VERSION = "0.1.2"
+  VERSION = "0.1.8"
   LIBRDKAFKA_VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdkafka
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.8
 platform: ruby
 authors:
 - Thijs Cadier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi