fluent-plugin-archagent 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 546c5a6ad8db55c14e830f9630cfe690b243409b
-  data.tar.gz: ef30d7d2bcfdc913d03b08d13e21df16ffe8b81d
+  metadata.gz: efe242f9fe55889fff7c4a4619eddab44fd67c68
+  data.tar.gz: 54eceb112086c82ee1e2573fc8b6671a5a27f998
 SHA512:
-  metadata.gz: 271fd165b1236a7758c11a11176dab8e607c3da08b7803f7052280ee5f19d57fe8b1573c361b7747529d971c3971c1f71e8d842ab544edc39cd05412b5aa1bb1
-  data.tar.gz: 2e26fa7cb03296cb0d951a90604ca162310e04cbcd31277f5704f021814a2f74599dca04df5d3ae50984a29d6d91a62bca2372da66b7759903785371d87318bf
+  metadata.gz: f0757c57125978ac63c69b2aedbbdb9c8d086adb92a5e24d5251895797c5e74997c5fcdbf3bfae90fdb0e11df9adfb4459ed6bf5c1d63c2d56fa92505abb9a38
+  data.tar.gz: f0d14d6fe705683579f025d12787635d7758aed6279e13f322e050c86ea957f42e46057d422636fa8180ba31c8bec9380f59a1ee5e2c440eaca5460e600deb84

data/fluent-plugin-archagent.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-archagent"
-  spec.version = "0.1.1"
+  spec.version = "0.1.2"
   spec.authors = ["apoorv"]
   spec.email   = ["apoorv@archsaber.com"]
 

data/lib/fluent/plugin/out_archagent.rb

@@ -1,93 +1,91 @@
 module Fluent::Plugin
-  class ArchagentOutput < Fluent::BufferedOutput
-  Fluent::Plugin.register_output("archagent", self)
+    class ArchagentOutput < Fluent::BufferedOutput
+    Fluent::Plugin.register_output("archagent", self)
 
-  def initialize
-    super
-    require 'net/http'
-    require 'uri'
-  end
+    def initialize
+      super
+      require 'net/http'
+      require 'uri'
+    end
 
-  # Archagent port for listening to logs from apache. This should be same as the one specified
+    # Archagent port for listening to logs from apache. This should be same as the one specified
     # in data.json for archagent
-  config_param :port, :string, default: '8018'
+    config_param :port, :string, default: '8118'
 
-  # read timeout for the http call
-  config_param :http_read_timeout, :float, default: 2.0
+    def configure(conf)
+      super
 
-  # open timeout for the http call
-  config_param :http_open_timeout, :float, default: 2.0
+      endpoint_url = 'http://localhost:' + @port
+      # Check if endpoint URL is valid
+      unless endpoint_url =~ /^#{URI.regexp}$/
+        fail Fluent::ConfigError, 'port invalid'
+      end
 
-  def configure(conf)
-    super
+      begin
+        @uri = URI.parse(endpoint_url)
+      rescue URI::InvalidURIError
+        raise Fluent::ConfigError, 'port invalid'
+      end
+    end
 
-    endpoint_url = 'http://localhost:' + @port
-    # Check if endpoint URL is valid
-    unless endpoint_url =~ /^#{URI.regexp}$/
-      fail Fluent::ConfigError, 'port invalid'
+    def format(tag, time, record)
+      [tag, time, record].to_msgpack
     end
 
-    begin
-      @uri = URI.parse(endpoint_url)
-    rescue URI::InvalidURIError
-      raise Fluent::ConfigError, 'port invalid'
+    def start
+      super
     end
 
-    @http = Net::HTTP.new(@uri.host, @uri.port)
-    @http.read_timeout = @http_read_timeout
-    @http.open_timeout = @http_open_timeout
-  end
+    def shutdown
+      super
 
-  def format(tag, time, record)
-    [tag, time, record].to_msgpack
-  end
+      disconnect
+    end
 
-  def start
-    super
-  end
+    def write(chunk)
+      log_data = []
+      chunk.msgpack_each do |(tag, time, record)|
+        record['host'] = (record.has_key? 'host') && record['host'] != nil && record['host'] != "" ? \
+            record['host'].to_s : 'unknown'
+        record['code'] = (record.has_key? 'code') && record['code'] != nil && record['code'] != "" ? \
+            record['code'].to_i : -1
+        record['size'] = (record.has_key? 'size') && record['size'] != nil && record['size'] != "" ? \
+            record['size'].to_i : -1
+        record['latency'] = (record.has_key? 'latency') && record['latency'] != nil && \
+            record['latency'] != "" ? record['latency'].to_i : -1
+        log_data << record
+      end
 
-  def shutdown
-    super
-    begin
-      @http.finish
-    rescue
+      log_data_req = create_request(log_data)
+      response = connect.request(log_data_req)
+      return
     end
-  end
 
-  def write(chunk)
-    data = []
-    chunk.msgpack_each do |(tag, time, record)|
-      data << record
+    def connect
+      @http ||= Net::HTTP.start(
+        @uri.host,
+        @uri.port,
+        keep_alive_timeout: 60.0
+      )
     end
-    request = create_request(data)
 
-    begin
-      response = @http.start do |http|
-        request = create_request(data)
-        http.request request
-      end
-    rescue IOError, EOFError, SystemCallError => e
-      # server didn't respond
-      $log.warn "Net::HTTP.#{request.method.capitalize} raises exception: #{e.class}, '#{e.message}'"
-    ensure
-      begin
-        @http.finish
-      rescue
-      end
+    def disconnect
+      return unless defined?(@http)
+      return unless @http
+      @http.finish
     end
-  end
 
-  protected
+    protected
 
-  def create_request(data)
-    request = Net::HTTP::Post.new(@uri.request_uri)
+    def create_request(data)
+      request = Net::HTTP::Post.new(@uri.request_uri)
 
-    # Headers
-    request['Content-Type'] = 'application/json'
+      # Headers
+      request['Content-Type'] = 'application/json'
 
-    # Body
-    request.body = JSON.dump(data)
-    request
+      # Body
+      request.body = JSON.dump(data)
+      request
+    end
   end
-end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-archagent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - apoorv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +83,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- fluent-plugin-archagent-0.1.0.gem
 - fluent-plugin-archagent.gemspec
 - lib/fluent/plugin/out_archagent.rb
 - test/helper.rb