fluent-plugin-logentries 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ede9927a84f4346ffdf4298c2c4613a66a96a855
-  data.tar.gz: 7b4572090c1ef0d26a02518700859a0bc508f349
+  metadata.gz: 8c4b26041239f1c2c5dd795d1f4aadf4dd0241a5
+  data.tar.gz: 9616321ac7d35964d5ec8517203eb37c7a25ba5e
 SHA512:
-  metadata.gz: 5ad38d2ba03195a7a557075e113476314739e4625a1b140ed1bb320d3c75c5d1174ed7c4c9ea3c983f21406d3624627e0025d5aa7dbdc1b57d45180f93fb334e
-  data.tar.gz: ae09d8debfaabb0db41fde0bb5cdb479d2db14be08ee69ef6938009bd54155b51fb2776de050458281cdf49551eee8eae0ca11692a2050a5521cab96489bb3ac
+  metadata.gz: aa0e5144b3e4a0008e5a7fb2ebc8eee91f0e3a1641a708b9a48276bb73b1c9e0db7884a79a30834e6c86ab64e80493167d86cd58f0b17b91510bf0b2d9464464
+  data.tar.gz: 1cf6a1107c9ce8329151a852a1087477ca04e615e45f335e095319fc42d494a91c7c22af0b838fd6b658943ca911d49349065f5d5bdd58a5c41bcadce813af0f

data/README.md

@@ -5,7 +5,13 @@ Looks at the tag/message to find out where the log should go.
 
 ## Installation
 
-    /opt/td-agent/embedded/bin/fluent-gem install fluent-plugin-logentries
+install with gem or fluent-gem command as:
+
+### native gem
+    $ gem install fluent-plugin-logentries
+
+### fluentd gem
+    $ /opt/td-agent/embedded/bin/fluent-gem install fluent-plugin-logentries
 
 ## Configruation file (YML)
 

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.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["Woorank"]
   spec.email         = ["dev@woorank.com"]
   spec.summary       = "Logentries output plugin for Fluent event collector"

data/lib/fluent/plugin/out_logentries.rb

@@ -17,6 +17,9 @@ class LogentriesOutput < Fluent::BufferedOutput
 
   def configure(conf)
     super
+
+    @tokens    = nil
+    @last_edit = Time.at(0)
   end
 
   def start
@@ -44,17 +47,25 @@ class LogentriesOutput < Fluent::BufferedOutput
     return [tag, record].to_msgpack
   end
 
-  # Create tokens hash
-  def generate_token
+  # Parse an YML file and generate a list of tokens.
+  # It will only re-generate the list on changes.
+  def generate_tokens_list
     begin
-      YAML::load_file(@config_path)
+      edit_time = File.mtime(@config_path)
+
+      if edit_time > @last_edit
+        @tokens    = YAML::load_file(@config_path)
+        @last_edit = edit_time
+
+        log.info "Token(s) list updated."
+      end
     rescue Exception => e
       log.warn "Could not load configuration. #{e.message}"
     end
   end
 
   # Returns the correct token to use for a given tag / records
-  def get_token(tag, record, tokens)
+  def get_token(tag, record)
     tag     ||= ""
     message = record["message"]
 
@@ -64,8 +75,8 @@ class LogentriesOutput < Fluent::BufferedOutput
     #   app: TOKEN
     #   access: TOKEN (optional)
     #   error: TOKEN  (optional)
-    tokens.each do |key, value|
-      if tag.index(key) != nil || message.index(key) != nil then
+    @tokens.each do |key, value|
+      if tag.index(key) != nil || message.index(key) != nil
         default = value['app']
 
         case tag
@@ -85,14 +96,14 @@ class LogentriesOutput < Fluent::BufferedOutput
 
   # NOTE! This method is called by internal thread, not Fluentd's main thread. So IO wait doesn't affect other plugins.
   def write(chunk)
-    tokens = generate_token()
-    return unless tokens.is_a? Hash
+    generate_tokens_list()
+    return unless @tokens.is_a? Hash
 
     chunk.msgpack_each do |tag, record|
       next unless record.is_a? Hash
       next unless record.has_key? "message"
 
-      token = get_token(tag, record, tokens)
+      token = get_token(tag, record)
       next if token.nil?
 
       send_logentries(token + ' ' + record["message"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logentries
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Woorank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler