fluent-plugin-groonga 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea2a0b3df8c435d0718ecd86a87c339b45215056
-  data.tar.gz: e74d7f566d5750d323e2127bba23464b09623123
+  metadata.gz: dc768884f9ce10fdc73cc18f8d2cddae575b75a9
+  data.tar.gz: ee2ed4d2717c46d0aa5b52425591598e20971f80
 SHA512:
-  metadata.gz: 075b61389fa8e9177974cab39d3149844083e69c15a3fbf462ec22b84c5db145d7416b81c70d3b95bccc9c41efb1b9e66cfb4869bd667b2aa795a4743bdeac6f
-  data.tar.gz: 75400616911dc6935434a7bac18a366364e7eca2aef19816648902ed38fef98d94e9d92cf6876af2b4f6b0eb80d7d6a73564b418baa60aa41d85877bee93fb21
+  metadata.gz: b4dbd683a4cbe10a7477bbe08ce8e2a15aa3bd090fff6cc4f9e4810f04e0a46b212e96cacfb176fb9dcf5cf8efc952ca06862d0d9d6b1fe78107ee9bdcc94250
+  data.tar.gz: ae2d76e50c1c8cdfce5133bfa9c6bd708bd1725d4ce73c90f16e8b6a39452b68d59f462009f9dfa4368288ebb3c94523f201d10c6a07b796ebabba0a6130d459

data/doc/text/news.md

@@ -2,6 +2,18 @@
 
 # News
 
+## 1.1.6: 2016-10-03
+
+### Improvements
+
+* Supported "100-continue" case.
+  HTTP response shouldn't be finished when a HTTP client requests
+  "100-continue". curl, PHP HTTP client and so on use "100-continue"
+  when they send a large POST data. The input groonga plugin should
+  support "100-conitnue".
+* Ignored invalid JSON.
+* Added more information to logs.
+
 ## 1.1.5: 2016-09-28
 
 ### Improvements

data/fluent-plugin-groonga.gemspec

@@ -17,7 +17,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "fluent-plugin-groonga"
-  spec.version = "1.1.5"
+  spec.version = "1.1.6"
   spec.authors = ["Kouhei Sutou"]
   spec.email = ["kou@clear-code.com"]
   spec.summary = "Fluentd plugin to store data into Groonga and implement Groonga replication system."

data/lib/fluent/plugin/in_groonga.rb

@@ -182,7 +182,8 @@ module Fluent
       def run
         @loop.run
       rescue
-        $log.error "unexpected error", :error => $!.to_s
+        $log.error("[input][groonga][error] unexpected error",
+                   :error => "#{$!.class}: #{$!}")
         $log.error_backtrace
       end
 
@@ -213,7 +214,7 @@ module Fluent
         def on_connect
           @repeater = @input.create_repeater(self)
           @repeater.on_connect_failed do
-            $log.error("[input][groonga][error] " +
+            $log.error("[input][groonga][connect][error] " +
                        "failed to connect to Groonga:",
                        :real_host => @input.real_host,
                        :real_port => @input.real_port)
@@ -227,13 +228,13 @@ module Fluent
           begin
             @request_handler << data
           rescue HTTP::Parser::Error, URI::InvalidURIError
-            $log.error("[input][groonga][error] " +
+            $log.error("[input][groonga][request][error] " +
                        "failed to parse HTTP request:",
                        :error => "#{$!.class}: #{$!}")
             $log.error_backtrace
             reply_error_response("400 Bad Request")
           rescue
-            $log.error("[input][groonga][error] " +
+            $log.error("[input][groonga][request][error] " +
                        "failed to handle HTTP request:",
                        :error => "#{$!.class}: #{$!}")
             $log.error_backtrace
@@ -242,7 +243,16 @@ module Fluent
         end
 
         def write_back(data)
-          @response_handler << data
+          begin
+            @response_handler << data
+          rescue
+            $log.error("[input][groonga][response][error] " +
+                       "failed to handle HTTP response from Groonga:",
+                       :error => "#{$!.class}: #{$!}")
+            $log.error_backtrace
+            reply_error_response("500 Internal Server Error")
+            return
+          end
           write(data)
         end
 
@@ -372,15 +382,30 @@ module Fluent
         end
 
         def on_message_complete
+          return if @parser.status_code == 100
+
+          response = nil
           case @content_type
-          when /\Aapplication\/json\z/
-            response = JSON.parse(@body)
-          when /\Aapplication\/x-msgpack\z/
-            response = MessagePack.unpack(@body)
-          when /\Atext\/x-groonga-command-list/
+          when /\Aapplication\/json\z/i
+            begin
+              response = JSON.parse(@body)
+            rescue JSON::ParserError
+              $log.warn("[input][groonga][response][warn] " +
+                        "failed to parse response JSON:",
+                        :error => "#{$!.class}: #{$!}",
+                        :json => @body)
+            end
+          when /\Aapplication\/x-msgpack\z/i
+            begin
+              response = MessagePack.unpack(@body)
+            rescue MessagePack::UnpackError, EOFError
+              $log.warn("[input][groonga][response][warn] " +
+                        "failed to parse response MessagePack",
+                        :error => "#{$!.class}: #{$!}",
+                        :msgpack => @body)
+            end
+          when /\Atext\/x-groonga-command-list\z/i
             response = @body
-          else
-            response = nil
           end
           @handler.on_response_complete(response)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-groonga
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd