fluent-plugin-logentries 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc7d878212d636572f1c76d4aae79ad361d58c05
-  data.tar.gz: ea5d2e2687d9cd3a0d968614788e5c7748fd50c5
+  metadata.gz: a5f759b0770dd1199f13f790a4126cc58122da38
+  data.tar.gz: aa0ae2f4c53dcff7689f088740a8dc20f8398e64
 SHA512:
-  metadata.gz: 517c31c09547f44230438b99dab4f37c91116f21ae715720bc49cd89d2278e87f760ddc812d6afa16e8f6aa6403cf3fefd934b2d46fe332168c7c127dd81a660
-  data.tar.gz: f3b58edcdcff62fa381dfa766ef7e7508ea101f2c7b46a0f16b69c69b768b2ff3bca55fb922541543eb1366b9427f8f3bd7119c0d8be195a3e3bcd11173b845a
+  metadata.gz: 7ed23880d05afe47319e0efb17c75b4056402deb337d7c6be210692a97a06a9fcdaf01dbf7b1fac90be0f28c6131001d5a55d3fb11fdb319769b60b5d3c811cc
+  data.tar.gz: 01f32fef24d176376ab066149f7ceaae00829ee60fa0ffa686693b61fe2718354363af32fc01f23f83a2c4bdddf7c0ebf8c5a77016198f84574b9a001b9eb56c

data/fluent-plugin-logentries.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-logentries"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.4"
   spec.authors       = ["Woorank"]
   spec.email         = ["dev@woorank.com"]
   spec.summary       = "Logentries output plugin for Fluent event collector"

data/lib/fluent/plugin/out_logentries.rb

@@ -8,24 +8,13 @@ class LogentriesOutput < Fluent::BufferedOutput
 
   config_param :host, :string
   config_param :port, :integer, :default => 80
-  config_param :tokens, :string
+  config_param :path, :string
 
   def configure(conf)
     super
     @port   = conf['port']
     @host   = conf['host']
-    @tokens = parse_tokens(conf['tokens'])
-  end
-
-  def parse_tokens(list)
-    tokens_list = {}
-
-    list.split(',').each do |host|
-       key, token = host.split(':');
-       tokens_list[key] = token
-    end
-
-    tokens_list
+    @path   = conf['path']
   end
 
   def start
@@ -42,8 +31,25 @@ class LogentriesOutput < Fluent::BufferedOutput
     @_socket ||= TCPSocket.new @host, @port
   end
 
-  def get_token(tag)
-    @tokens.each do |key, value|
+  # This method is called when an event reaches to Fluentd.
+  def format(tag, time, record)
+    return [tag, record].to_msgpack
+  end
+
+  # Scan a given directory for host tokens
+  def generate_token(path)
+    tokens = {}
+
+    Dir[path << "*.token"].each do |file|
+      key = File.basename(file, ".token") #remove path/extension from filename
+      tokens[key] = File.open(file, &:readline).gsub(/\r\n|\r|\n/, '') #read the first line and close it
+    end
+    tokens
+  end
+
+  # returns the correct token to use for a given tag
+  def get_token(tag, tokens)
+    tokens.each do |key, value|
       if tag.index(key) != nil then
         return value
       end
@@ -52,16 +58,14 @@ class LogentriesOutput < Fluent::BufferedOutput
     return nil
   end
 
-  # This method is called when an event reaches to Fluentd.
-  def format(tag, time, record)
-    token = get_token(tag)
-    return [token, record].to_msgpack
-  end
-
   # NOTE! This method is called by internal thread, not Fluentd's main thread. So IO wait doesn't affect other plugins.
   def write(chunk)
-    chunk.msgpack_each do |token, record|
+    tokens = generate_token(@path)
+
+    chunk.msgpack_each do |tag, record|
       next unless record.is_a? Hash
+
+      token = get_token(tag, tokens)
       next if token.nil?
 
       if record.has_key?("message")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logentries
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - Woorank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler