franz 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd20ae601a812f14da2e9d9146e9d74970659581
-  data.tar.gz: 69e9d35c516f2cf92a318f8bc33ffc63f7639429
+  metadata.gz: 18c5e2e6c0b3f391583e4f98d594091363865650
+  data.tar.gz: 31764ccf1465afbbc33ca45d198f85c839c20fdd
 SHA512:
-  metadata.gz: 73af588b20cba91ff0c5cacd024976b003cec1a9ed0e3950652e0684ab8041393351b88d09d25199b996a844ffd8760f99da19f8ed418332d2d105443ba4a763
-  data.tar.gz: a9b99b414f778002471fc9ef24c133f57a06091304ba2c644decb6c1707d86ec323b7c7bd8730e523ac26aabe9724f997bbbfac438605f3d9427bfd176a3d871
+  metadata.gz: d132f1ebf38ca2691b12cb9e5143414b07ae2301254a6b8c7f608176818311e2ffc29a97600a1b935850b6b0f738e99a8e650257da59e2d1264b1c770dead8c2
+  data.tar.gz: 757893332467aaeeb7eb9398534b817b981dea1a518e27e83b07b57add7fab505dc86bc1636309884d1e6b135aaed0ba6e9bddd926853273b967b67711bdfb73

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/franz/output/kafka.rb

@@ -25,6 +25,7 @@ module Franz
           tags: [],
           input: [],
           output: {
+            topic: 'franz',
             flush_interval: 10,
             flush_size: 500,
             client_id: @@host,
@@ -49,6 +50,7 @@ module Franz
 
         @flush_size = opts[:output].delete :flush_size
         @flush_interval = opts[:output].delete :flush_interval
+        @topic = opts[:output].delete :topic
 
         kafka_brokers = opts[:output].delete(:brokers) || %w[ localhost:9092 ]
         kafka_client_id = opts[:output].delete :client_id
@@ -67,15 +69,15 @@ module Franz
 
         @thread = Thread.new do
           loop do
-            ready_messages = []
             @lock.synchronize do
               ready_messages = @messages
               @messages = []
+              @kafka.send_messages ready_messages unless ready_messages.empty?
+              log.debug \
+                event: 'periodic flush',
+                num_messages: ready_messages.size
             end
-            @kafka.send_messages ready_messages unless ready_messages.empty?
-            log.debug \
-              event: 'periodic flush',
-              num_messages: ready_messages.size
+
             sleep @flush_interval
           end
         end
@@ -90,16 +92,19 @@ module Franz
               raw: event
 
             payload = JSON::generate(event)
-            @messages << Poseidon::MessageToSend.new(event[:type].to_s, payload)
 
-            @statz.inc :num_output
+            @lock.synchronize do
+              @messages << Poseidon::MessageToSend.new(@topic, payload)
+
+              @statz.inc :num_output
 
-            if @messages.size >= @flush_size
-              @kafka.send_messages @messages
-              log.debug \
-                event: 'flush',
-                num_messages: @messages.size
-              @messages = []
+              if @messages.size >= @flush_size
+                @kafka.send_messages @messages
+                log.debug \
+                  event: 'flush',
+                  num_messages: @messages.size
+                @messages = []
+              end
             end
 
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Sean Clemmer