fluent-plugin-output-solr 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb2ceab3cbbcea52fc45b798fcafc0101e0d0477
-  data.tar.gz: e68164616412a7a22e2dfd0a7c480b36cfbb9e33
+  metadata.gz: 6a4eb0134ff37a071cd0d2f146374558469fdf7f
+  data.tar.gz: d32077fbc8d29b01be5b38c84645da9fa7dbd945
 SHA512:
-  metadata.gz: 88eedfd9043ffc95485489c43e96a7bbda53149c56f62ba515b40fe66edc1fda5765cfa98f4466c50bc5316908c8cf133a6ba706d314a8fe5a631a662094d4d4
-  data.tar.gz: be00852de009eacfc458478a5a25c313ddf318750e050925136fac4325ecdde1a90d017cc806087ad98e77aa92b6269d67464d0668948401c71929c60a6ca1dd
+  metadata.gz: 279793165b6c132e99ded418e4453c37025f9c796caa11ee6b59775681edb1196f17ce1a53684da842067c6f086b45c393591673b6faadec9de87b42255e119b
+  data.tar.gz: fbc1c4378f4d85146133971a99f9aa85b2b6cfab25c6998abc58f98907e2e1b85bd7c26283563e1e18eee09d5cf153f69d7044a6996410583b353aab9dd161de

data/README.md

@@ -104,12 +104,12 @@ The format of the time field (default %FT%TZ).
 time_format %FT%TZ
 ```
 
-### time_output_format
+### millisecond
 
-The format of the time field of Solr. (default %FT%TZ).
+Output millisecond to Solr (default false).
 
 ```
-time_output_format %FT%TZ
+millisecond false
 ```
 
 ### flush_size

data/fluent-plugin-output-solr.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-output-solr"
-  spec.version       = "0.4.10"
+  spec.version       = "0.4.11"
   spec.authors       = ["Minoru Osuka"]
   spec.email         = ["minoru.osuka@gmail.com"]
 

data/lib/fluent/plugin/out_solr.rb

@@ -13,7 +13,7 @@ module Fluent
     DEFAULT_TAG_FIELD = 'tag'
     DEFAULT_TIME_FIELD = 'time'
     DEFAULT_TIME_FORMAT = '%FT%TZ'
-    DEFAULT_TIME_OUTPUT_FORMAT = '%FT%TZ'
+    DEFAULT_MILLISECOND = false
     DEFAULT_FLUSH_SIZE = 100
     DEFAULT_COMMIT_WITH_FLUSH = true
 
@@ -49,8 +49,8 @@ module Fluent
                  :desc => 'A field name of event timestamp in the Solr schema.xml (default time).'
     config_param :time_format, :string, :default => DEFAULT_TIME_FORMAT,
                  :desc => 'The format of the time field (default %d/%b/%Y:%H:%M:%S %z).'
-    config_param :time_output_format, :string, :default => DEFAULT_TIME_OUTPUT_FORMAT,
-                 :desc => 'The format of the time field of Solr. (default %FT%TZ).'
+    config_param :millisecond, :bool, :default => DEFAULT_MILLISECOND,
+                 :desc => 'Output millisecond to Solr (default false).'
 
     config_param :flush_size, :integer, :default => DEFAULT_FLUSH_SIZE,
                  :desc => 'A number of events to queue up before writing to Solr (default 100).'
@@ -117,13 +117,27 @@ module Fluent
 
         if record.has_key?(@time_field) then
           begin
-            event_timestamp_dt = Time.strptime(record[@time_field], @time_format).to_s
-            record.merge!({@time_field => Time.parse(event_timestamp_dt.to_s).utc.strftime(@time_output_format)})
+            tmp_time = Time.strptime(record[@time_field], @time_format)
+            if @millisecond then
+              record.merge!({@time_field => '%s.%03dZ' % [tmp_time.utc.strftime('%FT%T'), tmp_time.usec/ 1000.0]})
+            else
+              record.merge!({@time_field => tmp_time.utc.strftime('%FT%TZ')})
+            end
           rescue
-            record.merge!({@time_field => Time.at(time).utc.strftime(@time_output_format)})
+            tmp_time = Time.at(time).utc
+            if @millisecond then
+              record.merge!({@time_field => '%s.%03dZ' % [tmp_time.utc.strftime('%FT%T'), tmp_time.usec/ 1000.0]})
+            else
+              record.merge!({@time_field => tmp_time.utc.strftime('%FT%TZ')})
+            end
           end
         else
-          record.merge!({@time_field => Time.at(time).utc.strftime(@time_output_format)})
+          tmp_time = Time.at(time).utc
+          if @millisecond then
+            record.merge!({@time_field => '%s.%03dZ' % [tmp_time.utc.strftime('%FT%T'), tmp_time.usec/ 1000.0]})
+          else
+            record.merge!({@time_field => tmp_time.utc.strftime('%FT%TZ')})
+          end
         end
 
         if @ignore_undefined_fields then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-output-solr
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Minoru Osuka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd