fluent-plugin-groonga 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5947627fa2f465811a846d3cd3ced7a8ac367674
-  data.tar.gz: cc846ea63eca88bdadbb9d5dceab7b806e36762d
+  metadata.gz: 0bc265b245e6b9c918bfdc1834791265151c8ba3
+  data.tar.gz: 0b6c197b73a5c68fa979390206f23dc32d43dc0c
 SHA512:
-  metadata.gz: 386b7122fc93b2bba7f8fdfea1648ce66b7ad4e20929ad1ea7ea7fae0fd731d6168e6aac8c18567af14cfb621bbe1b95fe8d9903f11e7e2a78aaf53db18bf6a3
-  data.tar.gz: f56bf5c5848837eca8cc8de484c8493aad1467a3655594963670118ca3dfa14aa6fa326927f3e557fdb58175982beac9a39fda56f263ca852fa7ddb8bc4e2e8a
+  metadata.gz: 14ad67248ed757b0c8c4536eafd4a50899b3a4e2d001d56b1793a0481d2ee41c1a4f21be3914fbbd68ea81d6a6e76fca8e8ea46d92aaff9ba759a651032fac15
+  data.tar.gz: 39b32665c9bb1a0442a08b1e03c03c89ddffaaedaa61582e15a1d164880fcc2504fbee61b9d987bcef8a4e8a390c21809b8ecb1ac97f3f3b28638a862bccd7d6

data/doc/text/news.md

@@ -2,6 +2,14 @@
 
 # News
 
+## 1.1.4: 2016-09-28
+
+### Improvements
+
+* Supported invalid request URL.
+* Added error class to log.
+* Added log on failing to connect to Groonga.
+
 ## 1.1.3: 2016-09-02
 
 ### Improvements

data/fluent-plugin-groonga.gemspec

@@ -17,7 +17,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "fluent-plugin-groonga"
-  spec.version = "1.1.3"
+  spec.version = "1.1.4"
   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

@@ -72,7 +72,7 @@ module Fluent
       end
 
       def on_read(data)
-        @handler.write(data)
+        @handler.write_back(data)
       end
 
       def on_close
@@ -213,6 +213,10 @@ module Fluent
         def on_connect
           @repeater = @input.create_repeater(self)
           @repeater.on_connect_failed do
+            $log.error("[input][groonga][error] " +
+                       "failed to connect to Groonga:",
+                       :real_host => @input.real_host,
+                       :real_port => @input.real_port)
             close
           end
           @request_handler = RequestHandler.new(@input, @repeater)
@@ -222,18 +226,24 @@ module Fluent
         def on_read(data)
           begin
             @request_handler << data
-          rescue HTTP::Parser::Error
+          rescue HTTP::Parser::Error, URI::InvalidURIError
             $log.error("[input][groonga][error] " +
                        "failed to parse HTTP request:",
-                       :error => $!.to_s)
+                       :error => "#{$!.class}: #{$!}")
             $log.error_backtrace
-            close
+            reply_error_response("400 Bad Request")
+          rescue
+            $log.error("[input][groonga][error] " +
+                       "failed to handle HTTP request:",
+                       :error => "#{$!.class}: #{$!}")
+            $log.error_backtrace
+            reply_error_response("500 Internal Server Error")
           end
         end
 
-        def write(data)
+        def write_back(data)
           @response_handler << data
-          super
+          write(data)
         end
 
         def on_response_complete(response)
@@ -261,6 +271,19 @@ module Fluent
             false
           end
         end
+
+        def reply_error_response(status)
+          write("HTTP1.1 #{status}\r\n")
+          write("Server: fluent-plugin-groonga\r\n")
+          write("Connection: close\r\n")
+          write("Content-Length: 0\r\n")
+          write("\r\n")
+          disable
+          @repeater.close
+          on_write_complete do
+            close
+          end
+        end
       end
 
       class RequestHandler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-groonga
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -193,9 +193,8 @@ summary: Fluentd plugin to store data into Groonga and implement Groonga replica
   system.
 test_files:
 - test/test_input.rb
-- test/run-test.rb
-- test/test_output.rb
+- test/output/test_table_definition.rb
 - test/output/test_table_index_definition.rb
 - test/output/test_type_guesser.rb
-- test/output/test_table_definition.rb
-has_rdoc: 
+- test/run-test.rb
+- test/test_output.rb