logjam_agent 0.26.4 → 0.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c8e42b18d0a11b8ce453738d1cb4dc06ea25953
-  data.tar.gz: 2f493b849beb47fcea291738157391069a12ff46
+SHA256:
+  metadata.gz: 3e5baacba1e04a269ab06f2c2b64f415da9fe20b5605131c72b14f4da7f6222c
+  data.tar.gz: ab45f9c10b79b8f22d16c4fc9a63e6adf0ad389b85664024ddff8696f56dc2b8
 SHA512:
-  metadata.gz: bfa705500fd1ecaeb6ffd83891690f0b93a821b19001be4eee2634bb9ea4af9c3da34f0555f516f0df3009583ee136f62c4eb7f4ac65a92c0279818071332771
-  data.tar.gz: 28953365be417e9244bc472455d614bcbd8a4ea39b312d05ce2b48e580644ff397acd24d90a056e5d8da25b384f179f851867033f9235e33f1f5795e23b2453e
+  metadata.gz: 180596a41cdf18f05d7032bf6e2da5f4140ad5f5da22a62392aced9e169af4f237393bd68be274a2224e57dd05557908d2c50d0f081340c2bda951888041d52a
+  data.tar.gz: 5697f97094cc3ae57f84ff5537d1e0665ac8f2b72437111615273f1b94d61a790d3fe220d9e9854de691bf386f877d83c53e9b04dcba84233bfe59dbcdb4983c

data/lib/logjam_agent/request.rb

@@ -37,6 +37,7 @@ module LogjamAgent
       @bytes_all_lines = 0
       @max_bytes_all_lines = LogjamAgent.max_bytes_all_lines
       @max_line_length = LogjamAgent.max_line_length
+      @lines_dropped = false
     end
 
     def start_time=(start_time)
@@ -70,17 +71,22 @@ module LogjamAgent
     end
 
     def add_line(severity, timestamp, message)
-      return if @bytes_all_lines > @max_bytes_all_lines
-      message = message.strip
-      if message.size > @max_line_length && severity < Logger::ERROR
-        message[(@max_line_length-21)..-1] = " ... [LINE TRUNCATED]"
-      end
       @mutex.synchronize do
-        if (@bytes_all_lines += message.bytesize) < @max_bytes_all_lines
-          @lines << [severity, format_time(timestamp), message]
-        else
-          @lines << [severity, format_time(timestamp), "... [LINES DROPPED]"]
+        if @bytes_all_lines > @max_bytes_all_lines
+          unless @lines_dropped
+            @lines << [severity, format_time(timestamp), "... [LINES DROPPED]"]
+            @lines_dropped = true
+          end
+          return
+        end
+        message = message.strip
+        if message.size > @max_line_length && 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]"
         end
+        @lines << [severity, format_time(timestamp), message]
       end
     end
 

data/lib/logjam_agent/version.rb

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

data/test/request_test.rb

@@ -0,0 +1,46 @@
+require_relative "test_helper.rb"
+
+module LogjamAgent
+  class RequestTest < MiniTest::Test
+
+    def setup
+      @request = Request.new("app", "env", {})
+      @request.instance_eval do
+        @max_bytes_all_lines = 100
+        @max_line_length = 50
+      end
+    end
+
+    TRUNCATED_LINE = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxx ... [LINE TRUNCATED]"
+
+    def test_truncates_lines_longer_than_max_line_length
+      @request.add_line(Logger::INFO, Time.now, "x" * 51)
+      assert_equal 1, lines(@request).size
+      assert_equal TRUNCATED_LINE, lines(@request).first[2]
+    end
+
+    def test_truncates_messages_larger_than_max_bytes_all_lines
+      @request.add_line(Logger::INFO, Time.now, "x" * 150)
+      assert_equal 1, lines(@request).size
+      assert_equal TRUNCATED_LINE, lines(@request).first[2]
+    end
+
+    def test_does_not_truncate_error_lines_if_overall_message_size_is_still_ok
+      @request.add_line(Logger::ERROR, Time.now, "x" * 70)
+      assert_equal 1, lines(@request).size
+      assert_equal "x" * 70, lines(@request).first[2]
+    end
+
+    def test_truncates_error_lines_if_message_size_id_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]
+    end
+
+    private
+
+    def lines(request)
+      request.instance_variable_get :@lines
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.26.5
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-11 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -163,6 +163,7 @@ files:
 - logjam_agent.gemspec
 - script/console
 - test/amqp_forwarder_test.rb
+- test/request_test.rb
 - test/test_helper.rb
 - test/util_test.rb
 - test/zmq_forwarder_test.rb
@@ -185,12 +186,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: logjam_agent
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Logjam client library to be used with logjam
 test_files:
 - test/amqp_forwarder_test.rb
+- test/request_test.rb
 - test/test_helper.rb
 - test/util_test.rb
 - test/zmq_forwarder_test.rb