testa_logger 0.1.14 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a925b10a67aa850c7b52f01d423b3c4f227ddd638f0c0180735752639a60649
-  data.tar.gz: 27924bc4702af164ab79646219d2f2545137789eddcd5bb66abb6a3104457f50
+  metadata.gz: dfd803d381aec073541589279ce2694765b9b3f523d945b73dfa208bc6a57f1d
+  data.tar.gz: 43e6b677000f40c5bb1dd26a0d759ff73e5e7d2e1190c9488ed022168e05b830
 SHA512:
-  metadata.gz: 60452c35d41dc37ef106d5dc89d8926882877b94c3a5cc2f3b49656772476aae07417ebb39c67e6baa81c2bd82a21f95725eac2544721601c9273965d975a629
-  data.tar.gz: 813a62359cee488550bbc4e042a93cc6c1a34c1b8b19b50ce76ce91c8d486d537b9aca841c7229e3dc5e5335f986eb9a58938530c430b12c0cac6e4527d3d1a0
+  metadata.gz: 77e2682e1e0fc974381a3902c913f1d2c026131ebf8cf8dcccbb2bcb6d5579cda3baa5eb39314fa227270e2c700529dfcc0b011cff5fbf1e2a4e989fff3f2c0d
+  data.tar.gz: 144a1e7fdf367b688aa387707841467de75f7ee71850bf96f0167219e61b3727c693581689c10421fc58ae0dfc5044454d23c6bb71435752a23bb30c146da1fc

data/.rubocop.yml

@@ -1,4 +1,5 @@
 # we have to have per project rubcop files (IDE limitation),
 # but we want only one config across all projects
 # you can override any global cops here, in this file
-inherit_from: ../.rubocop.yml
+inherit_from:
+  - ../.rubocop.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    testa_logger (0.1.14)
+    testa_logger (0.1.17)
       activesupport
       awesome_print
       aws-sdk-s3

data/lib/testa_logger/logger/dispatcher.rb

@@ -9,6 +9,9 @@ module TestaLogger
       def initialize(logger, faye_url, faye_token)
         @logger = logger
         @uri = URI.parse(faye_url)
+        @http = Net::HTTP.new(@uri.host, @uri.port)
+        @http.read_timeout = 2
+        @http.open_timeout = 2
         @faye_token = faye_token
         @channel = "/logs/live/#{logger.app}/#{logger.group}"
         @channel += "/#{logger.subgroup}" unless logger.subgroup.nil?
@@ -17,15 +20,19 @@ module TestaLogger
         at_exit { dispatch }
       end
 
-      def push(level, time, tag, formatted_text)
+      def push(level, time, tag, message, log)
         # after forking process, dispatch thread will stop working in the forked process
         run_dispatch_thread if @dispatch_thread.nil? || @dispatch_thread.status == false
 
         data = {
+          app: logger.app,
+          group: logger.group,
+          subgroup: logger.subgroup,
           level: level,
           time: time,
           tag: tag,
-          formatted_text: formatted_text,
+          message: message,
+          log: log,
         }
         @outbox << data
       end
@@ -57,7 +64,10 @@ module TestaLogger
           data: { logs: @outbox },
           ext: { auth_token: @faye_token },
         }
-        Net::HTTP.post_form(@uri, message: message.to_json)
+
+        request = Net::HTTP::Post.new(@uri.request_uri)
+        request.form_data = { message: message.to_json }
+        @http.request(request)
         @outbox.clear
       end
     end

data/lib/testa_logger/logger/options.rb

@@ -12,7 +12,7 @@ module TestaLogger
       attr_accessor :formatter
 
       # @return [TrueClass, FalseClass]
-      attr_accessor :live, :persist
+      attr_accessor :live, :persist, :stdout
 
       # @return [String, nil]
       attr_accessor :filepath
@@ -31,6 +31,7 @@ module TestaLogger
           "#{app_and_groups}[#{datetime.strftime('%Y-%m-%d %H:%M:%S.%L')}]  #{format('%-5.5s', severity)} -- : #{msg}\n"
         end
         @live = false
+        @stdout = false
         @filepath = nil
         @tag_length = 13
         @persist = true # requires aws credentials set in env variables
@@ -44,6 +45,7 @@ module TestaLogger
         }
 
         handle_user_options(options)
+        @live = false if app == "ws" # will cause endless loop otherwise
       end
 
       def format_app_and_groups(app, group, subgroup)
@@ -65,6 +67,7 @@ module TestaLogger
         end
         @formatter = options[:formatter] unless options[:formatter].nil?
         @live = options[:live] unless options[:live].nil?
+        @stdout = options[:stdout] unless options[:stdout].nil?
         @filepath = File.expand_path(options[:filepath]) unless options[:filepath].nil?
         @tag_length = options[:tag_length] unless options[:tag_length].nil?
         @persist = options[:persist] unless options[:persist].nil?

data/lib/testa_logger/logger/persistence.rb

@@ -37,10 +37,11 @@ module TestaLogger
 
           key = "logs/#{app}/#{group}"
           key += "/#{subgroup}" unless subgroup.nil?
+          key += "/#{Time.now.strftime('%d.%m.%Y')}"
 
           extension = File.extname(options.filepath)
           filename = File.basename(options.filepath, extension)
-          time_string = Time.now.strftime("%H_%M_%S__%d_%m_%Y")
+          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.

data/lib/testa_logger/logger.rb

@@ -179,28 +179,6 @@ module TestaLogger
       result
     end
 
-    class << self
-      def default_options
-        OpenStruct.new(
-          shift_age: "daily",
-          level: DEBUG,
-          formatter: default_formatter,
-          live: false,
-          filepath: nil,
-          tag_length: 13,
-          persist: true, # requires aws credentials set in env variables
-          faye_url: ENV["WEB_SOCKET_URL"],
-          faye_token: ENV["FAYE_TOKEN"],
-          s3_creds: {
-            region: ENV["AWS_REGION"],
-            access_key_id: ENV["AWS_ACCESS_KEY_ID"],
-            secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"],
-            bucket_name: ENV["S3_BUCKET_NAME"],
-          }
-        )
-      end
-    end
-
     private
 
     def add_log_to_queue(level, tag, args, &block)
@@ -208,12 +186,22 @@ module TestaLogger
 
       time = Time.now
       tag = extract_tag(tag, args)
-      text = create_log_string(tag, args, &block)
+      message = merge_message_args(args, &block)
+      tag_and_message = merge_tag_and_message(tag, args, &block)
       formatted_severity = format_severity(level)
-      formatted_text = format_message(formatted_severity, time, "", text)
+      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 @write_thread.nil? || @write_thread.status == false
+      @queue << log
+      @dispatcher.push(level, time, tag, message, log) if options.live
+      return unless options.stdout
 
-      @queue << formatted_text
-      @dispatcher.push(level, time, tag, formatted_text) if options.live
+      if level >= ERROR
+        warn log
+      else
+        puts log
+      end
     end
 
     # rails and other applications do not use tags,
@@ -228,9 +216,13 @@ module TestaLogger
       tag
     end
 
-    def create_log_string(tag, args, &block)
+    def merge_message_args(args, &block)
       args.push(block.call) if block
-      "[#{padded_tag(tag)}]: #{args_to_string(args.compact)}"
+      args_to_string(args.compact).to_s
+    end
+
+    def merge_tag_and_message(tag, message)
+      "[#{padded_tag(tag)}]: #{message}"
     end
 
     def padded_tag(tag)
@@ -255,8 +247,8 @@ module TestaLogger
       SEV_LABEL[severity] || "UNKNOWN"
     end
 
-    def format_message(severity, datetime, progname, msg)
-      options.formatter.call(severity, datetime, progname, msg)
+    def format_message(severity, datetime, progname, tag_and_message)
+      options.formatter.call(severity, datetime, progname, tag_and_message)
     end
   end
 end

data/lib/testa_logger/version.rb

@@ -1,3 +1,3 @@
 module TestaLogger
-  VERSION = "0.1.14"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testa_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.17
 platform: ruby
 authors:
 - karlo.razumovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport