lib/logjam_agent/request.rb in logjam_agent-0.9.12 vs lib/logjam_agent/request.rb in logjam_agent-0.10.0

@@ -15,10 +15,13 @@
       @lines = []
       @uuid = LogjamAgent.generate_uuid
       @fields = initial_fields.merge(:request_id => @uuid, :host => LogjamAgent.hostname, :process_id => Process.pid, :lines => @lines)
       @mutex = Mutex.new
       @ignored = false
+      @bytes_all_lines = 0
+      @max_bytes_all_lines = LogjamAgent.max_bytes_all_lines
+      @max_line_length = LogjamAgent.max_line_length
     end
 
     def ignore!
       @ignored = true
     end
@@ -42,11 +45,20 @@
     def caller_action
       @fields[:caller_action]
     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
+        message[(@max_line_length-21)..-1] = " ... [LINE TRUNCATED]"
+      end
       @mutex.synchronize do
-        @lines << [severity, format_time(timestamp), message.strip]
+        if (@bytes_all_lines += message.bytesize) < @max_bytes_all_lines
+          @lines << [severity, format_time(timestamp), message]
+        else
+          @lines << [severity, format_time(timestamp), "... [LINES DROPPED]"]
+        end
       end
     end
 
     def add_exception(exception)
       @mutex.synchronize do