fluent-plugin-heroku-syslog-http 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 532357c0144bd00b49441c441a413a1418857f42
-  data.tar.gz: 7d0804f14d7d041736c35d986f8c0db2fd6e34a8
+  metadata.gz: 0624c9d73582304ed077c39803d7350b425838c1
+  data.tar.gz: 339dc0f4a5166fe2d581e8524839c26e1606de76
 SHA512:
-  metadata.gz: fad8aed05a98d60e1e684ea0b9b3e99cdefcd296003a536d910ef0597fe77839b2c01f3fa3a0cfff2322209f6b5143b3d1ca3cde172ffd297d9c06440a1f6e62
-  data.tar.gz: 73df938e9c8a26fc7f53601631d633f5c4e852caf8973dd763f42f9f40b28a92e0c8d6fa173b834c8d561ff064672064903b0f32c027372042ada494fb50ded0
+  metadata.gz: ba3a89f11e524c6bc440c686ee76741a79af6f041199b156deed30607b6a26d87886ef151e7ff566b2e5c48d451fcfa7eb40d6228c11abcc33eb53f9d94d76fb
+  data.tar.gz: de9383bd19a6f5f7016626b83ac63c32d30217263f769f927eb30ac2164074a3ec5807b7a096e9eae74d541ae21ab9eb573d1ff9389aa2e2bf6338cd094874df

data/fluent-plugin-heroku-syslog-http.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-heroku-syslog-http'
-  gem.version       = '0.2.1'
+  gem.version       = '0.2.2'
   gem.authors       = ['Drivy', 'Kazuyuki Honda']
   gem.email         = ['sre@drivy.com']
   gem.description   = 'fluent plugin to drain heroku syslog'

data/lib/fluent/plugin/in_heroku_syslog_http.rb

@@ -19,15 +19,14 @@ module Fluent
         raise "'#{EVENT_RECORD_PARAMETER}' parameter is required" unless content
 
         messages = []
-        while payload = content.match(/^([0-9]+) (.*)$/) do
+        while payload = content.match(/^([0-9]+) (.*)$/m) do
           length = payload[1].to_i
-          raise "Invalid message length specified: #{length}" unless payload[2].size >= length
+          log.warn "Invalid message length specified: #{length}" unless payload[2].size >= length
 
           messages << payload[2][0...length]
           content = payload[2][length..-1] || ''
         end
-        content << content
-        raise "#{content.size} bytes left in payload" unless content.size == 0
+        log.warn "#{content.size} bytes left in payload" unless content.size == 0
 
         records = []
         messages.each do |msg|

data/lib/fluent/plugin/parser_heroku_syslog_http.rb

@@ -8,7 +8,7 @@ module Fluent
     class HerokuSyslogHttpParser < RegexpParser
       Fluent::Plugin.register_parser('heroku_syslog_http', self)
 
-      SYSLOG_HTTP_REGEXP = %r{^\<(?<syslog.pri>[0-9]+)\>([0-9]+) (?<syslog.timestamp>[^ ]+) (?<syslog.hostname>[^ ]+) (?<syslog.appname>[^ ]+) (?<syslog.procid>[^ ]+) - *(?<message>.*)$}
+      SYSLOG_HTTP_REGEXP = %r{^\<(?<syslog.pri>[0-9]+)\>([0-9]+) (?<syslog.timestamp>[^ ]+) (?<syslog.hostname>[^ ]+) (?<syslog.appname>[^ ]+) (?<syslog.procid>[^ ]+) - *(?<message>.*)$}m
 
       FACILITY_MAP = {
         0   => 'kern',

data/test/plugin/test_in_heroku_syslog_http.rb

@@ -81,6 +81,22 @@ class HerokuSyslogHttpInputTest < Test::Unit::TestCase
     assert_equal 'x' * 1024, d.events[1][2]['message']
   end
 
+  def test_newlines_in_payload
+    messages = [
+      "60 <13>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - foo\n",
+      "60 <13>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - bar\n",
+    ]
+    d = create_driver
+    d.run(expect_records: 1, timeout: 5) do
+      res = post(messages)
+      assert_equal '', res.body
+      assert_equal '200', res.code
+    end
+
+    assert_equal "foo\n", d.events[0][2]['message']
+    assert_equal "bar\n", d.events[1][2]['message']
+  end
+
   def test_accept_matched_drain_id_multiple
     messages = [
       '59 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - foo',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-heroku-syslog-http
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Drivy