logjam_agent 0.26.5 → 0.26.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e5baacba1e04a269ab06f2c2b64f415da9fe20b5605131c72b14f4da7f6222c
-  data.tar.gz: ab45f9c10b79b8f22d16c4fc9a63e6adf0ad389b85664024ddff8696f56dc2b8
+  metadata.gz: b7f3a26ece1694377a9666295fb2bfe225045e17b5a4f1b04567de18977bec00
+  data.tar.gz: 6efbafac6d94f691aab6d65f429e2c85548f0c6f8b14ad789d32268d09ef049a
 SHA512:
-  metadata.gz: 180596a41cdf18f05d7032bf6e2da5f4140ad5f5da22a62392aced9e169af4f237393bd68be274a2224e57dd05557908d2c50d0f081340c2bda951888041d52a
-  data.tar.gz: 5697f97094cc3ae57f84ff5537d1e0665ac8f2b72437111615273f1b94d61a790d3fe220d9e9854de691bf386f877d83c53e9b04dcba84233bfe59dbcdb4983c
+  metadata.gz: 135fc6975975ef3267f719595f3d73976608726bf1b0a9f517238f8bde826fc63fe0451d27500464bbefd3fd26e23f4e7c4d3a2e0edb681356b00725082e468d
+  data.tar.gz: cad5eb073e74419f3ecfc58e8ca085eb070b444271fe01ebeb490590bc795c803300975395e54aac1fb5de52d4d58261e73d0fd6fd3449bb40c43400d9d8c726

data/lib/logjam_agent/request.rb

@@ -80,11 +80,14 @@ module LogjamAgent
           return
         end
         message = message.strip
-        if message.size > @max_line_length && severity < Logger::ERROR
+        line_too_long = message.size > @max_line_length
+        if line_too_long && severity < Logger::ERROR
           message[(@max_line_length-21)..-1] = " ... [LINE TRUNCATED]"
         end
         if (@bytes_all_lines += message.bytesize) > @max_bytes_all_lines
-          message[(@max_line_length-21)..-1] = " ... [LINE TRUNCATED]"
+          if line_too_long
+            message[(@max_line_length-21)..-1] = " ... [LINE TRUNCATED]"
+          end
         end
         @lines << [severity, format_time(timestamp), message]
       end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.26.5"
+  VERSION = "0.26.6"
 end

data/test/request_test.rb

@@ -31,10 +31,17 @@ module LogjamAgent
       assert_equal "x" * 70, lines(@request).first[2]
     end
 
-    def test_truncates_error_lines_if_message_size_id_larger_than_max_bytes_all_lines
+    def test_truncates_long_error_lines_if_message_size_is_larger_than_max_bytes_all_lines
       @request.add_line(Logger::ERROR, Time.now, "x" * 120)
       assert_equal 1, lines(@request).size
-      assert_equal TRUNCATED_LINE, lines(@request).first[2]
+      assert_equal TRUNCATED_LINE, lines(@request)[0][2]
+    end
+
+    def test_truncates_long_lines_if_message_size_is_larger_than_max_bytes_all_lines
+      @request.add_line(Logger::INFO, Time.now, "y" * 80)
+      @request.add_line(Logger::ERROR, Time.now, "x" * 80)
+      assert_equal 2, lines(@request).size
+      assert_equal TRUNCATED_LINE, lines(@request)[1][2]
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.26.5
+  version: 0.26.6
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake