fluent-plugin-simple-logentries 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06e733cb821b8f88bf7120c955bc9b4a3e448d35
-  data.tar.gz: 20a8207684c939d30320cfd934090fd30ed16df9
+  metadata.gz: 6dafc9f608e3b911510e76d89cf0c1bd9ea51bcd
+  data.tar.gz: e18cb26eb01fd0ca79f9bba94ff7ef8ee0e3538f
 SHA512:
-  metadata.gz: e2f8de1f82ab72e5395587bf527a11e17d31eadb5f030949b53613dcc9779209c8501b22be75e41e29cd0b7ab7a7b65402697e166223e9d7ec3a7fbc29d5270c
-  data.tar.gz: 1507e874c7e97992468235b934477fb9ad63c07fbe64e4f4f4ac00052411e2f059b2ca888567b87127d352f8c4c3ba40f92517d780cc64f8d519eacf8fe56137
+  metadata.gz: 0203ac1e83df2a3a04dcd0c47b2a20f5ccc70631d07859e9204ee1662385488f0e1177eaf927154c527624ca59f416fe19d08ed97c482623205575780d95a0e1
+  data.tar.gz: 5306980edc8b63a63e16ca7cf240b78d44917762f77780c7fb511bca8f986c488085612e0d2973ae94beebbb70b9838572fcb6ba9d1c144dc5920acfb06df88e

data/fluent-plugin-simple-logentries.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-simple-logentries"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.description   = "Push fluent events to Logentries"
   spec.authors       = ["sowawa"]
   spec.email         = ["kesiuke.sogawa@gmail.com"]

data/lib/fluent/plugin/out_simple-logentries.rb

@@ -20,7 +20,6 @@ class Fluent::SimpleLogentriesOutput < Fluent::BufferedOutput
 
   def configure(conf)
     super
-    @last_edit = Time.at(0)
   end
 
   def start
@@ -76,7 +75,8 @@ class Fluent::SimpleLogentriesOutput < Fluent::BufferedOutput
                  elsif data.member?('messages')
                    data['messages']
                  end
-      data.delete(:messages) && data.delete('messages')
+      data.delete(:messages)
+      data.delete('messages')
       ([data] + split_messages(messages).map{|i| {messages: i}} ).each_with_index { |item, idx|
         push(JSON.generate({sequence: idx, identifyer: identifyer}.merge(item)))
       }
@@ -106,9 +106,26 @@ class Fluent::SimpleLogentriesOutput < Fluent::BufferedOutput
   end
 
   def split_messages(messages)
-    str_length = messages.length
-    return [messages] if SPLITED_ENTRY_SIZE > str_length
-    split_messages(messages[0..str_length/2]) +
-      split_messages(messages[(str_length/2)+1..str_length])
+    if messages.is_a? String
+      str_length = messages.length
+      return [messages] if SPLITED_ENTRY_SIZE > str_length
+      return split_messages(messages[0..str_length/2-1]) +
+        split_messages(messages[(str_length/2)..str_length])
+    elsif messages.is_a? Array
+      arr_length = messages.length
+      jsonfied = JSON.generate(messages)
+      str_length = jsonfied.length
+      return [messages] if SPLITED_ENTRY_SIZE > str_length
+      if arr_length == 1
+        split_messages(messages[0])
+      else
+        return split_messages(messages[0..arr_length/2-1]) +
+          split_messages(messages[(arr_length/2)..arr_length])
+      end
+    elsif messages.is_a? Hash
+      return split_messages(JSON.generate(messages))
+    else
+      raise TypeError, "Can't split unknown data type."
+    end
   end
 end

data/{test.conf → test.conf.sample}

@@ -3,6 +3,6 @@
 </source>
 <match rails.**>
   type simple-logentries
-  token 08f1b304-7b73-49d3-829a-49ab3b60ca37
-  flush_interval 2s
+  token 01b442e1-b695-4b07-bce3-71bb885a1a0e
+  flush_interval 1s
 </match>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-simple-logentries
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - sowawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,7 +49,7 @@ files:
 - Gemfile
 - fluent-plugin-simple-logentries.gemspec
 - lib/fluent/plugin/out_simple-logentries.rb
-- test.conf
+- test.conf.sample
 homepage: https://github.com/sowawa/fluent-plugin-simple-logentries
 licenses:
 - MIT