fluent-plugin-http-status 0.0.2 → 0.0.3

data/fluent-plugin-http-status.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-http-status"
-  gem.version       = "0.0.2"
+  gem.version       = "0.0.3"
   gem.authors       = ["hiro-su"]
   gem.email         = ["h.sugipon@gmail.com"]
   gem.description   = %q{Fluentd input plugin for to get the http status}

data/lib/fluent/plugin/in_http_status.rb

@@ -4,6 +4,9 @@ require "net/https"
 require "uri" 
 require "socket"
 
+ENV['LC_ALL'] = 'C'
+Encoding.default_external = 'ascii-8bit' if RUBY_VERSION > '1.9'
+
 module Fluent
   class HttpStatusInput < Input
     Plugin.register_input('http_status',self)
@@ -15,10 +18,10 @@ module Fluent
     config_param :proxy_port, :integer, :default => nil
     config_param :proxy_user, :string, :default => nil
     config_param :proxy_password, :string, :default => nil
-    config_param :open_timeout, :integer, :default => 10
+    config_param :open_timeout, :integer, :default => 20
     config_param :read_timeout, :integer, :default => 20
     config_param :params, :string, :default => nil
-    config_param :polling_time, :string
+    config_param :polling_time, :string, :default => "1m"
     config_param :basic_user, :string, :default => nil
     config_param :basic_password, :string, :default => nil
 
@@ -91,6 +94,13 @@ module Fluent
       port = uri.port
       request_uri = uri.request_uri
 
+      hash["url"] = url
+      hash["host"] = host
+      hash["port"] = port
+      hash["request_uri"] = request_uri
+      hash["proxy_address"] = @proxy_address if @proxy_address
+      hash["proxy_port"] = @proxy_port if @proxy_port
+
       http = Net::HTTP.new(host,port,@proxy_address,@proxy_port,@proxy_user,@proxy_password)
       http.open_timeout = @open_timeout
       http.read_timeout = @read_timeout
@@ -105,39 +115,31 @@ module Fluent
       req.basic_auth @basic_user, @basic_password
       response = http.request(req)
 
-      hash[:url] = url
-      hash[:host] = host
-      hash[:port] = port
-      hash[:request_uri] = request_uri
-      hash[:proxy_address] = @proxy_address if @proxy_address
-      hash[:proxy_port] = @proxy_port if @proxy_port
-      hash[:code] = response.code.to_i
-      hash[:message] = response.message
-      hash[:class_name] = response.class.name
+      hash["code"] = response.code.to_i
+      hash["message"] = response.message
+      hash["class_name"] = response.class.name
       hostent = Socket.gethostbyname(host)
-      hash[:ipaddress] = hostent[3].unpack("C4").join('.')
-      hash[:headers] = Hash.new
+      hash["ipaddress"] = hostent[3].unpack("C4").join('.')
+      hash["headers"] = Hash.new
 
       response.each_key{|name|
         if @params
-          @params.each{|param| hash[:headers][param] = response[param] =~ /^-?\d+$/ ? response[param].to_i : response[param]}
+          @params.each{|param| hash["headers"][param] = response[param] =~ /^-?\d+$/ ? response[param].to_i : response[param]}
         else
-          hash[:headers][name] = response[name] =~ /^-?\d+$/ ? response[name].to_i : response[name]
+          hash["headers"][name] = response[name] =~ /^-?\d+$/ ? response[name].to_i : response[name]
         end
       }
 
-      response_time = Time.now - start
-      hash[:response_time] = response_time * 1000
-      return hash
     rescue Timeout::Error => ex
-      $log.error "Timeout Error : #{ex.message}"
-      hash[:code] = 408
-      hash[:message] = ex.message
-      return hash
+      $log.error "Timeout Error : #{url}:#{port}#{request_uri}"
+      hash["code"] = 408
+      hash["message"] = ex.message
     rescue => ex
-      $log.error ex.message
-      hash[:code] = 000
-      hash[:message] = ex.message
+      $log.error "#{ex.message} : #{url}:#{port}#{request_uri}"
+      hash["code"] = 0
+      hash["message"] = ex.message
+    ensure
+      hash["response_time"] = (Time.now - start) * 1000 #msec
       return hash
     end
 

data/test/plugin/test_in_http_status.rb

@@ -30,6 +30,22 @@ class HttpStatusInputTest < Test::Unit::TestCase
   end
 
   def test_configure
+    assert_raise(Fluent::ConfigError) {
+      d = create_driver('')
+    }
+    
+    assert_raise(Fluent::ConfigError) {
+      d = create_driver %[
+            tag http.status
+          ] 
+    }
+    
+    assert_raise(Fluent::ConfigError) {
+      d = create_driver %[
+            url http://example.com
+          ] 
+    }
+    
     d = create_driver
 
     assert_equal "http.status", d.instance.tag
@@ -58,7 +74,7 @@ class HttpStatusInputTest < Test::Unit::TestCase
     }
 
     headers = {}
-    headers[:headers] = {
+    headers["headers"] = {
       "server" => "Apache",
       "date" => "Sun, 18 Nov 2012 17:12:09 GMT",
       "last-modified" => "Thu, 15 Nov 2012 02:00:30 GMT",
@@ -71,22 +87,23 @@ class HttpStatusInputTest < Test::Unit::TestCase
     }
 
     Socket.stubs(:gethostbyname).returns(["www.test.ad.jp", [], 0, "\xC0\xA8\x00\x01"])
-    WebMock.stub_request(:head, "www.test.ad.jp").to_return(:status => 200, :headers => headers[:headers])
+    WebMock.stub_request(:head, "www.test.ad.jp").to_return(:status => 200, :headers => headers["headers"])
     res_data = @obj.__send__(:get_status,@hash,args)
-    res_data[:response_time] = 0.001239
+    res_data["response_time"] = 1.239
     
     result_hash = {
-      :url=>"http://www.test.ad.jp",
-      :host=>"www.test.ad.jp", 
-      :port=>80, :request_uri=>"/",
-      :proxy_address=>"proxy.test.jp",
-      :proxy_port=>8080,
-      :code=>200,
-      :message=>"",
-      :class_name=>"Net::HTTPOK",
-      :ipaddress=>"192.168.0.1",
-      :response_time=>0.001239,
-      :headers=>{
+      "url"=>"http://www.test.ad.jp",
+      "host"=>"www.test.ad.jp", 
+      "port"=>80,
+      "request_uri"=>"/",
+      "proxy_address"=>"proxy.test.jp",
+      "proxy_port"=>8080,
+      "code"=>200,
+      "message"=>"",
+      "class_name"=>"Net::HTTPOK",
+      "ipaddress"=>"192.168.0.1",
+      "response_time"=>1.239,
+      "headers"=>{
         "server"=>"Apache",
         "date"=>"Sun, 18 Nov 2012 17:12:09 GMT",
         "last-modified"=>"Thu, 15 Nov 2012 02:00:30 GMT", 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-http-status
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd