fluent-plugin-http-pull 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 001a669d9fa3eccbeaa6f6db2e532e27fe85bfba518463a8dceeac3246abeca6
-  data.tar.gz: 19effaa1d73dd98100104ce3aaf3966d23bbf6a63ec76ee6338a33d789d237fb
+  metadata.gz: 1ebdf162fc73a902dcc82066deded9baa3e6db27fc1bcaefafffc8853ba56414
+  data.tar.gz: bae9f6c485df205a49f6cc02d677dcab14b7a6a1001b1c5ae1d6750e7ea878b1
 SHA512:
-  metadata.gz: 9d3647df586360e9df56a3aae6379c9cdb9df729a55af9440f441c1d6c1da47527ec576de3038de635a8ca262f3fd052b88990a60971ca00aab11a61fa1d11c0
-  data.tar.gz: 6198fc5e08f7832a52524f8ef043e8cf10baba91ec2c42ec5312d2f47bbe79409e08eb296e0997912406ffaa9564d7cb766faf416f756fe4126da0342d4337f2
+  metadata.gz: 693cb1b84e4c6404dad557220d76985a3748d072f94ed50dcb33d37d48e8d49d40a425daf237e6d5d5dc38fb7f67fc1d5a712689abf7370a100d19d7db95e842
+  data.tar.gz: f9c936914205618d366b78a15bde44f00e65949783bb362b9ad9a743f8df609292d8d3e1129e8c9a29fc41e801767b11c5f3c88503fa47f3b2dc9ae491bb9e43

data/fluent-plugin-http-pull.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-http-pull"
-  spec.version = "0.8.2"
+  spec.version = "0.8.3"
   spec.authors = ["filepang"]
   spec.email   = ["filepang@gmail.com"]
 

data/lib/fluent/plugin/in_http_pull.rb

@@ -109,53 +109,24 @@ module Fluent
       end
 
       def on_timer
-        record = { "url" => @url }
+        body = nil
+        record = nil
 
         begin
-          request_options = { method: @http_method, url: @url, timeout: @timeout, headers: @_request_headers }
-
-          request_options[:proxy] = @proxy if @proxy
-          request_options[:user] = @user if @user
-          request_options[:password] = @password if @password
-
-          request_options[:verify_ssl] = @verify_ssl
-          if @verify_ssl and @ca_path and @ca_file
-            request_options[:ssl_ca_path] = @ca_path
-            request_options[:ssl_ca_file] = @ca_file
-          end
-
           res = RestClient::Request.execute request_options
+          record, body = get_record(res)
 
-          record["status"] = res.code
-          record["body"] = res.body
-
-          record["header"] = {} unless @response_headers.empty?
-          @response_headers.each do |section|
-            name = section["header"]
-            symbolize_name = name.downcase.gsub(/-/, '_').to_sym
-
-            record["header"][name] = res.headers[symbolize_name]
-          end
         rescue StandardError => err
+          record = { "url" => @url, "error" => err.message }
           if err.respond_to? :http_code
             record["status"] = err.http_code || 0
           else
             record["status"] = 0
           end
-
-          record["error"] = err.message
         end
 
         record_time = Engine.now
-
-        if !@status_only && record["body"] != nil
-          @parser.parse(record["body"]) do |time, message|
-            record["message"] = message
-            record_time = time
-          end
-        end
-
-        record.delete("body")
+        record = parse(record, body)
         router.emit(@tag, record_time, record)
       end
 
@@ -163,6 +134,47 @@ module Fluent
         super
       end
 
+      private
+      def request_options
+        options = { method: @http_method, url: @url, timeout: @timeout, headers: @_request_headers }
+
+        options[:proxy] = @proxy if @proxy
+        options[:user] = @user if @user
+        options[:password] = @password if @password
+
+        options[:verify_ssl] = @verify_ssl
+        if @verify_ssl and @ca_path and @ca_file
+          options[:ssl_ca_path] = @ca_path
+          options[:ssl_ca_file] = @ca_file
+        end
+
+        return options
+      end
+
+      def get_record(response)
+        body = response.body
+        record = { "url" => @url, "status" => response.code }
+        record["header"] = {} unless @response_headers.empty?
+        @response_headers.each do |section|
+          name = section["header"]
+          symbolize_name = name.downcase.gsub(/-/, '_').to_sym
+
+          record["header"][name] = response.headers[symbolize_name]
+        end
+
+        return record, body
+      end
+
+      def parse(record, body)
+        if !@status_only && body != nil
+          @parser.parse(body) do |time, message|
+            record["message"] = message
+            record_time = time
+          end
+        end
+
+        return record
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-http-pull
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - filepang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake