fluent-plugin-output-solr 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c6f8222ca0caa3aab7d45245fabcb11e366829
-  data.tar.gz: 9a764db856bc8c0a929d69cb83513d02c05cac6b
+  metadata.gz: bef37db6afb6d0104ca4e9942148760dd163e86a
+  data.tar.gz: 9c8e3ac8d9f5dfa6b2074b2f11f0325f31f60ad0
 SHA512:
-  metadata.gz: 98e5f570b06cb21f647bd716adeacf1ae97860153c4a0786d1be1c3bd51cacc373ae0e4a71ddcb7f271635989112455289dde153979383a4b4e5a0e8de3a007e
-  data.tar.gz: 8328972f13b14dfe7660d16e630e6ae7a8076f7a7ca370d018f557a8e6dbd00b43cbcf1fd27bdb66a40b6459d5a66bd523652605679edcb264b0c360a396f5fb
+  metadata.gz: b46104d132011125b60ab250678ff57e372d171272435a284d82af5ce44c05dc838cc0f45918467ebe9e974e915ee68002ec858eecf65e5f100b3e3f3dbb50e7
+  data.tar.gz: a1436fbcc3b111ef0aa47086903ab9f041610c0fb65721697d01e03ec5de49a7eb547040ae98265f59b6141def4a5ab685c23881ff22c7a7d3de905f2b8a9ba2

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.2.4"
+  spec.version       = "0.2.5"
   spec.authors       = ["Minoru Osuka"]
   spec.email         = ["minoru.osuka@gmail.com"]
 

data/lib/fluent/plugin/out_solr.rb

@@ -58,7 +58,7 @@ module Fluent
       @collection = conf.has_key?('collection') ? conf['collection'] : DEFAULT_COLLECTION
 
       @defined_fields = conf['defined_fields']
-      @ignore_undefined_fields = conf.has_key?('ignore_undefined_fields') ? conf['ignore_undefined_fields'] : DEFAULT_IGNORE_UNDEFINED_FIELDS
+      @ignore_undefined_fields = conf.has_key?('ignore_undefined_fields') ? to_boolean(conf['ignore_undefined_fields']) : DEFAULT_IGNORE_UNDEFINED_FIELDS
 
       @unique_key_field = conf['unique_key_field']
       @tag_field = conf.has_key?('tag_field') ? conf['tag_field'] : DEFAULT_TAG_FIELD
@@ -120,17 +120,16 @@ module Fluent
           record.merge!({@timestamp_field => Time.at(time).utc.strftime('%FT%TZ')})
         end
 
-        log.info record
-
-        if to_boolean(@ignore_undefined_fields) then
+        if @ignore_undefined_fields then
           record.each_key do |key|
             unless @fields.include?(key) then
               record.delete(key)
             end
           end
-          log.info record
         end
 
+        log.info "Record: %s" % record.inspect
+
         documents << record
 
         if documents.count >= @flush_size
@@ -143,10 +142,14 @@ module Fluent
     end
 
     def to_boolean(string)
-      return true if string== true || string =~ (/(true|t|yes|y|1)$/i)
-      return false if string== false || string.nil? || string =~ (/(false|f|no|n|0)$/i)
-      raise ArgumentError.new("invalid value for Boolean: \"#{string}\"")
-    end
+      if string== true || string =~ (/(true|t|yes|y|1)$/i) then
+        return true
+      elsif string== false || string.nil? || string =~ (/(false|f|no|n|0)$/i)
+        return false
+      else
+        return false
+      end
+    end    
 
     def update(documents)
       if @mode == MODE_STANDALONE then
@@ -154,10 +157,10 @@ module Fluent
         log.info "Added %d document(s) to Solr" % documents.count
       elsif @mode == MODE_SOLRCLOUD then
         @solr.add documents, collection: @collection, :params => {:commit => true}
-        log.info "Added %d document(s) to Solr" % documents.count
+        log.info "Update: Added %d document(s) to Solr" % documents.count
       end
       rescue Exception => e
-        log.warn("An error occurred while indexing: #{e.message}")
+        log.warn "Update: An error occurred while indexing: #{e.message}"
     end
 
     def get_unique_key
@@ -170,12 +173,12 @@ module Fluent
       end
 
       unique_key = response['uniqueKey']
-      log.info ("Unique key: #{unique_key}")
+      log.info "Unique key: #{unique_key}"
 
       return unique_key
 
       rescue Exception => e
-        log.warn("An error occurred while indexing: #{e.message}")
+        log.warn "Unique key: #{e.message}"
     end
 
     def get_fields
@@ -191,12 +194,12 @@ module Fluent
       response['fields'].each do |field|
         fields.push(field['name'])
       end
-      log.info ("Fields: #{fields}")
+      log.info "Fields: #{fields}"
 
       return fields
 
       rescue Exception => e
-        log.warn("An error occurred while indexing: #{e.message}")
+        log.warn "Fields: #{e.message}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-output-solr
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Minoru Osuka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd