logjam_agent 0.34.0 → 0.34.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3cc7aaf7edaf4f4a2ab8b0cbb9922449fcadf2ca515add756d9052ca30f104a
-  data.tar.gz: 9c648bc52c752ebd7a394b9b74f5a2d2ff1f92aff23393a37dcd714b324339ea
+  metadata.gz: f440bd17eaed288b652b4537a82ebcedaa6aae2c213e99cfce4c9a78259c8e1a
+  data.tar.gz: 4c437031ed233e9b836714742f37e23a6b8b2bcc81155776d8ce31b17040cdd5
 SHA512:
-  metadata.gz: 29350bbdb8502910e181ee155a369d0a16793a916430b4150aee46e956e931aac3ba697d9066e0bc14c6826918b1085022b492e13d283f3f49b19cd10a2a2c22
-  data.tar.gz: 1798f1ce01b48e947fd4b54455c8f446551e474b93120fed751eefc0ea72584e68b610d7d2cbe4fa7f46b4f6d97a9a82d50049339cb477b5dfad62b9a57c005f
+  metadata.gz: d614ce5608d99b1735766d0d99a0b99d64a78bd75146891036d0063b11728ef8d92b0fcbb3de1bd95acd92999969fb0d4afcc06c9a439e986c279848eb899ee6
+  data.tar.gz: 4f63d8cef062c3350e6fbbc26a997300fb5928430bf335a3d3efb959e97fd6ca7e14e13bd1ca15a4d58575485104005416b042b2b4546d6a1c017218b8789efa

data/lib/logjam_agent/buffered_logger.rb

@@ -62,7 +62,7 @@ module LogjamAgent
       time = Time.now
       if log_to_log_device
         formatted_message = formatter.call(format_severity(severity), time, progname, message)
-        @logdev.write(formatted_message)
+        @logdev.write(formatted_message) if @logdev
       end
       request.add_line(severity, time, message) if request
       message
@@ -70,7 +70,6 @@ module LogjamAgent
 
     def logdev=(log_device)
       raise "cannot connect logger to new log device" unless log_device.respond_to?(:write)
-      raise "cannot set log device" unless defined?(@logdev)
       @logdev = log_device
     end
 

data/lib/logjam_agent/rack/logger.rb

@@ -32,21 +32,24 @@ module LogjamAgent
 
       def call_app(request, env)
         start_time = Time.now
-        wait_time_ms = 0.0
+        start_clock = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        wait_time = 0.0
         if http_start_time = extract_http_start_time(env)
-          wait_time_ms = (start_time - http_start_time) * 1000
-          if wait_time_ms > 0
+          wait_time = start_time - http_start_time
+          if wait_time > 0
             start_time = http_start_time
           else
-            wait_time_ms = 0.0
+            wait_time = 0.0
           end
         end
+        wait_time_ms =  wait_time * 1000
         before_dispatch(request, env, start_time, wait_time_ms)
         result = @app.call(env)
       rescue ActionDispatch::RemoteIp::IpSpoofAttackError
         result = [403, {}, ['Forbidden']]
       ensure
-        run_time_ms = (Time.now - start_time) * 1000
+        end_clock = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        run_time_ms = (end_clock - start_clock + wait_time) * 1000
         after_dispatch(env, result, run_time_ms, wait_time_ms)
       end
 

data/lib/logjam_agent/sinatra.rb

@@ -38,7 +38,7 @@ module LogjamAgent
       LogjamAgent.log_device_log_level = logger.level
       LogjamAgent.log_device_log_level = ::Logger::ERROR unless %i[test development].include?(settings.environment.to_sym)
 
-      logger.formatter = LogjamAgent::SyslogLikeFormatter.new
+      logger.formatter = settings.respond_to?(:logformatter) ? settings.logformatter : Logger::Formatter.new
       logger = ActiveSupport::TaggedLogging.new(logger)
       LogjamAgent.logger = logger
       ActiveSupport::LogSubscriber.logger = logger

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.34.0"
+  VERSION = "0.34.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.34.3
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake