testa_logger 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bccba94675dff6f881b604cec301bcea54e1a99b653db95c7ce156ddf8104de
-  data.tar.gz: '05984a867c873368a4da65b0539a7e981cc0119e5076d142408e725066121cc4'
+  metadata.gz: dfd803d381aec073541589279ce2694765b9b3f523d945b73dfa208bc6a57f1d
+  data.tar.gz: 43e6b677000f40c5bb1dd26a0d759ff73e5e7d2e1190c9488ed022168e05b830
 SHA512:
-  metadata.gz: 9995ca14b6c4b97370c2600ee5c401f6e8b54447f402d776e3e7f2882ef91d7cb724a0ecea3d418125991b11531ca0f5a2fcc7a7aba611c15b4e60f482a08022
-  data.tar.gz: 15f463df8811cb1d16a72dfbb8b57f440fd73d55eb3ed8566ccc729b47b76831c3889679bf76c6749f406d6eeb66827be94a78275175c9c180dfeda6ece5bbe2
+  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.16)
+    testa_logger (0.1.17)
       activesupport
       awesome_print
       aws-sdk-s3

data/lib/testa_logger/logger/dispatcher.rb

@@ -20,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

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
@@ -66,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,14 +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 << formatted_text
-      @dispatcher.push(level, time, tag, formatted_text) if options.live
+      @queue << log
+      @dispatcher.push(level, time, tag, message, log) if options.live
+      return unless options.stdout
+
+      if level >= ERROR
+        warn log
+      else
+        puts log
+      end
     end
 
     # rails and other applications do not use tags,
@@ -230,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)
@@ -257,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.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testa_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - karlo.razumovic