logjam_agent 0.9.12 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f89e8dab06c035772e2cb51c4b28d57b03f5909
-  data.tar.gz: adddab6424954392a6b5c073cea7a65fefe2ae1a
+  metadata.gz: 5280a58a1c2c44ccacf015d14a112e8ad4875d6e
+  data.tar.gz: 4fa82e320cf620961b277da6738d3ef3f7a1423f
 SHA512:
-  metadata.gz: 04cb99940ad5b20d1e65aa94b7c4e29a128c34bc09c3cae44e9d8d1f18af8a4330775c33da4a329635723c5135039176101d5a5cde2e747c854e760e3ffd1960
-  data.tar.gz: 7c51e5bc69d9e6564537614e51ebd21391491f50670de373418e00c9ea60340746daf6b1af62c9d65b7c7a85d1419b710188e385c4c0a3de1f816e736551444e
+  metadata.gz: d06732e50a957ace135f09e04dd5ee20d968b6265f49e1d21654818d0f5a43bbb8cbc2824ec88e1a32515dff952248d30f9c5c845a2f71c77d8c967f83cd57ed
+  data.tar.gz: dde6c145c7fc906bb2de41b1dfff97d150924d36f81e52383e1314efa322bdf94d00e53ab4f300f1167300b9405898ce7c76c45b02b396c98ed2f9629cfea1c8

data/README.md

@@ -55,6 +55,14 @@ module LogjamAgent
   # Configure lines which will not be logged locally.
   # They will still be sent to the logjam server. Defaults to nil.
   # self.log_device_ignored_lines = /^\s*Rendered/
+
+  # Configure maximum log line length. Defaults to 2048.
+  # This setting only applies to the lines sent with the request.
+  self.max_line_length = 2048
+
+  # Configure max bytes allowed for all log lines. Defaults to 1Mb.
+  # This setting only applies to the lines sent with the request.
+  self.max_bytes_all_lines = 1024 * 1024
 end
 ```
 

data/lib/logjam_agent/request.rb

@@ -17,6 +17,9 @@ module LogjamAgent
       @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!
@@ -44,8 +47,17 @@ 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
+        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
 

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.9.12"
+  VERSION = "0.10.0"
 end

data/lib/logjam_agent.rb

@@ -116,6 +116,12 @@ module LogjamAgent
   mattr_accessor :log_device_ignored_lines
   self.log_device_ignored_lines = nil
 
+  mattr_accessor :max_line_length
+  self.max_line_length = 2048
+
+  mattr_accessor :max_bytes_all_lines
+  self.max_bytes_all_lines = 1024 * 1024
+
   def self.log_to_log_device?(msg)
     !(log_device_ignored_lines && msg =~ log_device_ignored_lines)
   rescue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.10.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake