testa_logger 0.1.23 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fc3283c9e219fa0df7fa94523a6c71d5078095137b40605cf7a28c6c775a67d
-  data.tar.gz: 3bd3c773dc957103999ccc809c562b8fc4ef22600a643411d12f393d2a2b31f7
+  metadata.gz: 6ea01fffdf48772f4fa366f3e4730c53aa7dd1d366fd3b16e839acfde756e876
+  data.tar.gz: 3fd7fe0c69af421586140b6be1d2d811312a7e338059331938c751a7d1ef2f62
 SHA512:
-  metadata.gz: a6f72724334e8d75e0a9dbcbaa1de87afd25c0f203b6e60c7656e0cfcafab5e040dead005eab6e2055d68a9712d376ba0ee9fe389ca07ceab1f5f4cefa3133cf
-  data.tar.gz: 65f0fb6dc5f8147167172a97ed046ab6847904cc631b7fade48172e3e637eaaaac0534e75bb2417614b32e7d7b90f957870a90553d7c53c54862f50745b50618
+  metadata.gz: 4d9121752a32f087931db122c6268f2d1a98470a19a440b2315d34c776e5200c61269e8825508a145181b4fb291c007c5df6231d2289f346ba15e04f29a7df08
+  data.tar.gz: c7cd4e516d98b52959b8db64b3168af65ebe1f938bac24d9194557311d3f0f8de9a028cb8733b8e369587ba25314b7b6905d2154f4337f2516cd271fa7e0c53b

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    testa_logger (0.1.23)
+    testa_logger (0.1.27)
       activesupport
       awesome_print
       aws-sdk-s3
-      concurrent-ruby
       json
       securerandom
 

data/lib/testa_logger/log_device.rb

@@ -41,13 +41,13 @@ module TestaLogger
         begin
           @dev.write(message)
         rescue StandardError => e
-          warn("log writing failed. #{e}")
+          warn("log writing failed 1. #{e}")
         end
       end
     rescue SystemExit
       exit 1
     rescue Exception => e
-      warn("log writing failed. #{e}")
+      warn("log writing failed 2. #{e}")
     end
 
     def close

data/lib/testa_logger/logger/dispatcher.rb

@@ -15,7 +15,7 @@ module TestaLogger
         @faye_token = faye_token
         @channel = "/logs/live/#{logger.app}/#{logger.group}"
         @channel += "/#{logger.subgroup}" unless logger.subgroup.nil?
-        @outbox = Concurrent::Array.new
+        @outbox = []
         run_dispatch_thread
         at_exit { dispatch if @outbox.count.positive? }
       end

data/lib/testa_logger/logger/persistence.rb

@@ -17,15 +17,13 @@ module TestaLogger
         raise IoPersistenceError if @log_device.is_a?(IO)
 
         begin
-          # stop writing into log file with it is being attached, otherwise checksum integrity will fail.
-          write_thread["stop"] = true
+          @pause = true
           record.send(attachment_name).attach(io: File.open(options.filepath), filename: "#{attachment_name}.log")
         rescue StandardError => e
           error(TAG, e)
           raise
         ensure
-          write_thread["stop"] = false
-          write_thread.run
+          @pause = false
         end
       end
 
@@ -33,7 +31,7 @@ module TestaLogger
         return if @s3.nil?
 
         begin
-          write_thread["stop"] = true
+          @pause = true
 
           key = "logs/#{app}/#{group}"
           key += "/#{subgroup}" unless subgroup.nil?
@@ -44,7 +42,6 @@ module TestaLogger
           time_string = Time.now.strftime("%H_%M_%S")
           key += "/#{filename}_#{time_string}#{extension}"
 
-          # stop writing into log file with it is being attached, otherwise checksum integrity will fail.
           response = @s3.put_object(
             bucket: options.s3_credentials[:bucket_name],
             key: key,
@@ -55,8 +52,7 @@ module TestaLogger
           error(TAG, e)
           raise
         ensure
-          write_thread["stop"] = false
-          write_thread.run
+          @pause = false
         end
       end
     end

data/lib/testa_logger/logger.rb

@@ -34,15 +34,16 @@ module TestaLogger
     NO_TAG = "NO-TAG"
 
     def initialize(app, group, subgroup = nil, options = {})
+      @pause = false
+      @pending_logs = []
+
       @app = app
       @group = group
       @subgroup = subgroup
       @options = Options.new(app, group, subgroup, options)
       create_log_file
       setup_dispatcher
-      start_write_thread
       init_s3_client if @options.persist
-      at_exit { flush_queue }
     end
 
     def create_log_file
@@ -65,51 +66,32 @@ module TestaLogger
       )
     end
 
-    def start_write_thread
-      @pid = Process.pid
-      # we must use this queue in order to be able to collect logs in trap context
-      @queue = Queue.new
-      @write_thread = Thread.new do
-        loop { queue_pop }
-      end
-    end
-
-    def flush_queue
-      queue_pop while @queue.size.positive?
-    end
-
-    def queue_pop
-      text = @queue.pop
-      Thread.stop if Thread.current["stop"]
-      @log_device.write(text)
-    end
-
     def formatter
       options.formatter
     end
 
     def debug(tag = nil, *args, &block)
-      add_log_to_queue(DEBUG, tag, args, &block)
+      add(DEBUG, tag, args, &block)
     end
 
     def info(tag = nil, *args, &block)
-      add_log_to_queue(INFO, tag, args, &block)
+      add(INFO, tag, args, &block)
     end
 
     def warn(tag = nil, *args, &block)
-      add_log_to_queue(WARN, tag, args, &block)
+      add(WARN, tag, args, &block)
     end
 
     def error(tag = nil, *args, &block)
-      add_log_to_queue(ERROR, tag, args, &block)
+      add(ERROR, tag, args, &block)
     end
 
     def fatal(tag = nil, *args, &block)
-      add_log_to_queue(FATAL, tag, args, &block)
+      add(FATAL, tag, args, &block)
     end
 
     def unknown(tag = nil, *args, &block)
-      add_log_to_queue(UNKNOWN, tag, args, &block)
+      add(UNKNOWN, tag, args, &block)
     end
 
     def level=(severity)
@@ -189,7 +171,7 @@ module TestaLogger
 
     private
 
-    def add_log_to_queue(level, tag, args, &block)
+    def add(level, tag, args, &block)
       return if level < options.level
 
       time = Time.now
@@ -199,9 +181,18 @@ module TestaLogger
       formatted_severity = format_severity(level)
       log = format_message(formatted_severity, time, "", tag_and_message)
 
-      # after forking process, write thread will stop working in the forked process
-      start_write_thread if @pid.nil? || @pid != Process.pid
-      @queue << log
+      if @pause
+        @pending_logs << log
+      else
+        if @pending_logs.count.positive?
+          @pending_logs.each do |pending_log|
+            @log_device.write(pending_log)
+          end
+          @pending_logs.clear
+        end
+        @log_device.write(log)
+      end
+
       @dispatcher.push(level, time, tag, message, log) if options.live
       return unless options.stdout
 

data/lib/testa_logger/version.rb

@@ -1,3 +1,3 @@
 module TestaLogger
-  VERSION = "0.1.23"
+  VERSION = "0.1.27"
 end

data/lib/testa_logger.rb

@@ -5,7 +5,6 @@ require_relative "testa_logger/io_persistence_error"
 require "active_support"
 require "active_support/core_ext/hash"
 require "awesome_print"
-require "concurrent-ruby"
 require "json"
 require "uri"
 require "net/http"

data/testa_logger.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "awesome_print"
   spec.add_runtime_dependency "aws-sdk-s3"
-  spec.add_runtime_dependency "concurrent-ruby"
+  # spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "json"
   spec.add_runtime_dependency "securerandom"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testa_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.27
 platform: ruby
 authors:
 - karlo.razumovic
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement