fluent-plugin-kafka 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a35c789b318f3ac5d6fa70545b170a65b3bf0b3
-  data.tar.gz: 77216b2f697aaf4a0a5b53e237f2f5d73c05105f
+  metadata.gz: 69682c218b44b78ebe360adaa07d2defc25c8eb0
+  data.tar.gz: b0e9f47b62c7753988933ac6ab1b4221ab38ef92
 SHA512:
-  metadata.gz: 109ac7d58c512e2b38c1b9cc847e23ad59e84da495874be2135647526bfc3b99dde08a7aae8ab3255d56d834cb71dde2c1d1f9e65933c10f760d34591b5da66b
-  data.tar.gz: cabfb8f1f4a67e2e631f13c774b8802e95f683b3042c076c8e27cfe60669e9cb36cc29b9e6947c4a8235ddaf7b47ae3d657df8faeef2d07c678a94a2561e5e06
+  metadata.gz: 1187e4ed38b2d93636de7699ba75a1d1759f1dafa0f3aab8b6fa93ff1738230bf7850405809764ec8d1ccabe3d6cf7b6a63d4c730867db442e04facd6081e4f4
+  data.tar.gz: 2fd63a22abb00ded8024596c710393cf797965beb94e22a742800b8fd5329483430c0d3fc16458e993e4bd0851456d3956c5a90593915af9a9cce534e5e42789

data/README.md

@@ -41,7 +41,7 @@ Or install it yourself as:
       zookeeper           <zookeeper_host>:<zookeeper_port> # Set brokers via Zookeeper
 
       default_topic       <output topic>
-      output_data_type    (json|ltsv|msgpack|attr:<record name>)
+      output_data_type    (json|ltsv|msgpack|attr:<record name>|<formatter name>)
       output_include_tag  (true|false) :default => false
       output_include_time (true|false) :default => false
       max_send_retries    (integer)    :default => 3
@@ -77,7 +77,7 @@ Install snappy module before you use snappy compression.
       default_topic       <output topic>
       flush_interval      <flush interval (sec) :default => 60>
       buffer_type         (file|memory)
-      output_data_type    (json|ltsv|msgpack|attr:<record name>)
+      output_data_type    (json|ltsv|msgpack|attr:<record name>|<formatter name>)
       output_include_tag  (true|false) :default => false
       output_include_time (true|false) :default => false
       max_send_retries    (integer)    :default => 3

data/fluent-plugin-kafka.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-kafka"
   gem.require_paths = ["lib"]
-  gem.version = '0.0.11'
+  gem.version = '0.0.12'
   gem.add_dependency 'fluentd'
   gem.add_dependency 'poseidon'
   gem.add_dependency 'ltsv'

data/lib/fluent/plugin/out_kafka.rb

@@ -85,6 +85,8 @@ class Fluent::KafkaOutput < Fluent::Output
                          elsif @output_data_type =~ /^attr:(.*)$/
                            $1.split(',').map(&:strip).reject(&:empty?)
                          else
+                           @formatter = Fluent::Plugin.new_formatter(@output_data_type)
+                           @formatter.configure(conf)
                            nil
                          end
 
@@ -128,7 +130,8 @@ class Fluent::KafkaOutput < Fluent::Output
         record['tag'] = tag if @output_include_tag
         topic = record['topic'] || self.default_topic || tag
         partition = record['partition'] || self.default_partition
-        message = Poseidon::MessageToSend.new(topic, parse_record(record))
+        value = @formatter.nil? ? parse_record(record) : @formatter.format(tag, time, record)
+        message = Poseidon::MessageToSend.new(topic, value)
         @producer.send_messages([message])
       end
     rescue Exception => e

data/lib/fluent/plugin/out_kafka_buffered.rb

@@ -91,6 +91,8 @@ class Fluent::KafkaOutputBuffered < Fluent::BufferedOutput
                          elsif @output_data_type =~ /^attr:(.*)$/
                            $1.split(',').map(&:strip).reject(&:empty?)
                          else
+                           @formatter = Fluent::Plugin.new_formatter(@output_data_type)
+                           @formatter.configure(conf)
                            nil
                          end
   end
@@ -143,7 +145,7 @@ class Fluent::KafkaOutputBuffered < Fluent::BufferedOutput
         records_by_topic[topic] ||= 0
         bytes_by_topic[topic] ||= 0
 
-        record_buf = parse_record(record)
+        record_buf = @formatter.nil? ? parse_record(record) : @formatter.format(tag, time, record)
         record_buf_bytes = record_buf.bytesize
         if messages.length > 0 and messages_bytes + record_buf_bytes > @kafka_agg_max_bytes
           @producer.send_messages(messages)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kafka
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Hidemasa Togashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd