fluent-plugin-logentries 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9dc127810fa3d5522616e3c205379f0ec0b3cd6
-  data.tar.gz: 3ba77e7184f8399ef5fff37b45dd5383386c53e5
+  metadata.gz: 5beb1e38eb0e532236e6f2f436313c463acc3345
+  data.tar.gz: a7f2329cdaa95765e437d50ee809d3784f5da269
 SHA512:
-  metadata.gz: aac5c28fd8e2a68e1eaf61ba4de4fe1f944e9154f1da081bd17ec9bd565096f6322b1100a36b1ad05da1bfbfe203904336e6db956149ac0eff5acde2e5c82696
-  data.tar.gz: 589753d61522bed56175b889e89cccaff30db3dbba331a2cee12f09884c111f78c8a20f8d1b5e0639fdc396ef38279263196f2563297032ff24c1d8a07d1b8d9
+  metadata.gz: 5697474e7c8cc0687872c3ab9d944457e842f330826b9b09f979419d405a5e63477bdc3ed546f039227c68e8c3621c2973ae98ada074ec4dd04dc1f9f6eb7044
+  data.tar.gz: 930745d5d730c51de345847fd57570d926dfc5d8c38fef31ddc60d4b2c09302f9a52f416bf42decf6ee74ec8086dc1774629cfb70e4535d584d4857951e94afe

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.DS_Store
 Gemfile.lock
 InstalledFiles
 _yardoc

data/README.md

@@ -20,14 +20,14 @@ install with gem or fluent-gem command as:
        app: MY-LOGENTRIES-TOKEN
        access: ANOTHER-LOGENTRIES-TOKEN (*)
        error: ANOTHER-LOGENTRIES-TOKEN-1 (*)
-    Foo:
+    Another-app:
        app: 2bfbea1e-10c3-4419-bdad-7e6435882e1f
        access: 5deab21c-04b1-9122-abdc-09adb2eda22 (*)
        error: 9acfbeba-c92c-1229-ccac-12c58d82ecc (*)
 ```
-(*) `access` and `error are optional, if you don't use multiple log per host just provide an app token.
+(*) `access` and `error` are optional, if you don't use multiple log per host just provide an app token.
 
-This file is read everytime the buffer is flushed, it allows on fly modifications.
+This file is read on changes, it allows on fly modifications.
 ## Usage
 
 ```

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

data/lib/fluent/plugin/out_logentries.rb

@@ -2,7 +2,7 @@ require 'socket'
 require 'yaml'
 require 'openssl'
 
-class LogentriesOutput < Fluent::BufferedOutput
+class Fluent::LogentriesOutput < Fluent::BufferedOutput
   class ConnectionFailure < StandardError; end
   # First, register the plugin. NAME is the name of this plugin
   # and identifies the plugin in the configuration file.
@@ -77,7 +77,7 @@ class LogentriesOutput < Fluent::BufferedOutput
 
   # Returns the correct token to use for a given tag / records
   def get_token(tag, record)
-    app_name = record["app_name"] || record["message"]
+    app_name = record["app_name"] || ''
 
     # Config Structure
     # -----------------------
@@ -86,7 +86,7 @@ class LogentriesOutput < Fluent::BufferedOutput
     #   access: TOKEN (optional)
     #   error: TOKEN  (optional)
     @tokens.each do |key, value|
-      if tag.index(key) != nil || app_name.index(key) != nil
+      if tag.index(key) != nil || app_name == key
         default = value['app']
 
         case tag
@@ -118,14 +118,15 @@ class LogentriesOutput < Fluent::BufferedOutput
 
       # Clean up the string to avoid blank line in logentries
       message = record["message"].rstrip()
-      send_logentries("#{token} #{message} \n")
+      send_logentries(token, message)
+
     end
   end
 
-  def send_logentries(data)
+  def send_logentries(token, data)
     retries = 0
     begin
-      client.write data
+      client.write("#{token} #{data} \n")
     rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
       if retries < @max_retries
         retries += 1
@@ -135,6 +136,12 @@ class LogentriesOutput < Fluent::BufferedOutput
         retry
       end
       raise ConnectionFailure, "Could not push logs to Logentries after #{retries} retries. #{e.message}"
+    rescue Errno::EMSGSIZE
+      str_length = data.length
+      send_logentries(token, data[0..str_length/2])
+      send_logentries(token, data[(str_length/2)+1..str_length])
+
+      log.warm "Message Too Long, re-sending it in two part..."
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logentries
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Woorank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler