stackify-api-ruby 1.2.7 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e13cf81984bdf8a8f010af5a741a3d98e56cb5aff747c8dbc934c0a47edf1a5
-  data.tar.gz: f4f69adfdde2a04c864440a8ca8dd3859529b4d397cbd26005dca9bd2aa1fea7
+  metadata.gz: 371cb99e1d47ff1680b37a4e4a8b69a992787ef047c3973e923bb08032486239
+  data.tar.gz: 379714698256d7614a12b1e07e996e5a0256f868df5db33e103ec136fd8eec01
 SHA512:
-  metadata.gz: a27451afa0f62688c83977a9fb05f595689d0617d7c2d4f4e286c058d018e8eefe8051f03d4443dc27d3ebaaa35b0959ca281aa6205cf4e9dc777f259add3283
-  data.tar.gz: 2827a27560393bee018e43c0055b7ef2a32baeb569e7df45f84313fea6cd8aef5b75c1d1a9d8e4d3ad2af0a81f0b068b44f57ef1d7b73a83a9a6af4769a10007
+  metadata.gz: f7aff04aee12c3a8346c39fb32f34965f360e969e960607053685c3081b2a27a333e4e7842d87f486d3ddb2341b49f18107276c96d8090d1b90e6ea258b766ab
+  data.tar.gz: 7e2d3a430f5794f6e29689255adc9be0dd36b4bddc9504507161c1a0d0edd4699bfa1df675c803f0bc1c4bd4090d2b080bf78886837f89f0b84d74e7f673f050

data/lib/stackify-api-ruby.rb

@@ -120,7 +120,7 @@ module Stackify
 
     def run
       Stackify::Utils.is_api_enabled
-      Stackify.internal_log :info, "Stackify.run() transportType = #{Stackify.configuration.transport} | API version: #{Stackify::VERSION}"
+      Stackify.internal_log :info, "Stackify.run() transportType: #{Stackify.configuration.transport} | API version: #{Stackify::VERSION} | Ruby version: #{RUBY_VERSION}"
       if Stackify.configuration.api_enabled
         if Stackify.is_valid?
           # check transport types

data/lib/stackify/authorization/authorizable.rb

@@ -11,7 +11,11 @@ module Stackify::Authorizable
     @@auth_client = nil
 
     def authorize attempts=3
-      Stackify::EnvDetails.instance.set_rails_info
+      # Check if the ruby version is 2.0 we get the Rails info properties such as
+      # <Application root: e.g., /home/user/rails_app> which is required in authorization
+      if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.0')
+        Stackify::EnvDetails.instance.set_rails_info
+      end
       @@auth_lock.synchronize do
         return unless @@auth_client.nil?
         @@auth_client = Stackify::Authorizable::AuthorizationClient.new

data/lib/stackify/engine.rb

@@ -4,7 +4,32 @@ module Stackify
 
     if Rails.version > '3.1'
       initializer 'Stackify set up of logger', group: :all do
+        if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('4.0')
+          # check if the client app is using the ActiveSupport::Logger
+          is_activesupport_logger = ::Rails.logger.is_a?(ActiveSupport::Logger)
+        elsif Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('3.0')
+          Stackify::Utils.check_buffered_logger
+        end
+
+        # Check if the log output is STDOUT
+        Stackify::Utils.check_log_output
+
+        # Proxy the client Rails logger and write logs to its default log_path.
+        # At the same time, we send the log messages to the LoggerClient.
         ::Rails.logger = ::Stackify::LoggerProxy.new ::Rails.logger
+
+        if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('6.0')
+          set_console_logs ::Rails.logger
+        elsif Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('4.0')
+          if is_activesupport_logger && Stackify.configuration.stdout_output
+            set_console_logs ::Rails.logger
+          end
+          # Another checking if the client app is using the default logger and not STDOUT
+          if Stackify.configuration.stdout_output == false
+            set_console_logs ::Rails.logger
+          end
+        end
+
         Stackify.run
       end
 
@@ -14,6 +39,16 @@ module Stackify
         end
       end
 
+      def set_console_logs logger
+        # Handle the stdout logs from Action Controller
+        ActionController::Base.logger = logger
+
+        # Handle the stdout logs from Action View
+        ActionView::Base.logger = logger
+
+        # Handle the stdout logs from Active Record
+        ActiveRecord::Base.logger = logger
+      end
     end
 
   end

data/lib/stackify/logger_client.rb

@@ -12,7 +12,33 @@ module Stackify
       end
     end
 
-    def log level, msg, call_trace
+    # This function is responsible in displaying log messages based on the level criteria
+    # @param num_level [Integer]  level of the clients Rails.logger
+    # @param level [String]       level coming from array of levels(debug info warn error fatal unknown) that we are going to filter with num_level
+    #                             So we filter all logs from num_level up to this level
+    # @param msg [Integer]        log messages
+    # @param call_trace [Object]  return the current execution stack
+    def log num_level, level, msg, call_trace
+      display_log = true
+      log_appender = false
+      buffer_log = false
+      if defined? Rails
+        display_log = false if Stackify.configuration.stdout_output
+        log_appender = true if defined?(Logging)
+        buffer_log = true if Stackify.configuration.buffered_logger
+        unless buffer_log
+          if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('4.0')
+            if display_log && log_appender
+              puts msg if num_level <= Logger.const_get(level.upcase).to_i
+            elsif display_log && log_appender == false
+              puts msg if num_level <= Logger.const_get(level.upcase).to_i
+            end
+          end
+        end
+      else
+        puts msg if num_level <= Logger.const_get(level.upcase).to_i
+      end
+
       return if @@transport.nil?
       task = log_message_task level, msg, call_trace
       @@transport.log level, msg, call_trace, task

data/lib/stackify/logger_proxy.rb

@@ -1,14 +1,16 @@
+
 module Stackify
   class LoggerProxy < Object
 
     def initialize logger
-      @logger = logger
-      @logger.level = Logger.const_get(Stackify.configuration.log_level.to_s.upcase)
+      rails_logger  = logger
+      num_level     = logger.level
+      @logger       = rails_logger
       %w(debug info warn error fatal unknown).each do |level|
         stackify_logger = if level == 'debug'
-          -> (msg, caller) { Stackify.logger_client.log(level.downcase, msg, caller) unless msg.to_s.empty? }
+          -> (msg, caller) { Stackify.logger_client.log(num_level, level.downcase, msg, caller) unless msg.to_s.empty? }
         else
-          -> (msg, caller) { Stackify.logger_client.log(level.downcase, msg, caller) }
+          -> (msg, caller) { Stackify.logger_client.log(num_level, level.downcase, msg, caller) }
         end
         LoggerProxy.class_eval do
           define_method level.to_sym do |*args , &block|

data/lib/stackify/utils/configuration.rb

@@ -3,7 +3,7 @@ module Stackify
   class Configuration
 
     attr_accessor :api_key, :app_name, :app_location, :env, :log_level, :logger,
-                  :proxy, :mode, :base_api_url, :api_enabled, :transport, :errors, :http_endpoint
+                  :proxy, :mode, :base_api_url, :api_enabled, :transport, :errors, :http_endpoint, :stdout_output, :buffered_logger
 
     attr_reader :send_interval, :flood_limit, :queue_max_size, :agent_log_url, :unix_socket_path, :http_endpoint
 
@@ -25,6 +25,8 @@ module Stackify
       @agent_log_url = '/log'
       @unix_socket_path = '/usr/local/stackify/stackify.sock'
       @http_endpoint = get_env 'STACKIFY_TRANSPORT_HTTP_ENDPOINT', 'https://localhost:10601'
+      @stdout_output = false
+      @buffered_logger = false
     end
 
     def get_env env_key, default

data/lib/stackify/utils/methods.rb

@@ -46,4 +46,29 @@ module Stackify::Utils
       'app_location' => Stackify.configuration.app_location || Dir.pwd
     }
   end
-end
+
+  # Check if the app is running on rails and the logger output is using STDOUT
+  def self.check_log_output
+    if defined? Rails
+      if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('5.0')
+        Stackify.configuration.stdout_output = ActiveSupport::Logger.logger_outputs_to?(Rails.logger, STDOUT)
+      else
+        Stackify.configuration.stdout_output = self.logger_stdout
+      end
+    end
+  end
+
+  def self.logger_stdout
+    logdev = ::Rails.logger.instance_variable_get(:@logdev)
+    logger_source = logdev.dev if logdev.respond_to?(:dev)
+    sources = [$stdout]
+    found = sources.any? { |source| source == logger_source }
+  end
+
+  # Check if the rails version 3 and it's using the buffered logger
+  def self.check_buffered_logger
+    is_buffered_logger = false
+    is_buffered_logger = true if ::Rails.logger.is_a?(ActiveSupport::BufferedLogger)
+    Stackify.configuration.buffered_logger = is_buffered_logger
+  end
+end

data/lib/stackify/version.rb

@@ -1,3 +1,3 @@
 module Stackify
-  VERSION = '1.2.7'
+  VERSION = '1.2.9'
 end

data/lib/stackify/workers/logs_sender_worker.rb

@@ -3,6 +3,14 @@ module Stackify
 
     def initialize name = 'LogsSender worker'
       super
+      case Stackify.configuration.transport
+      when Stackify::DEFAULT
+        name = 'LogsSender worker'
+      when Stackify::UNIX_SOCKET
+        name = 'UnixSocketSender worker'
+      when Stackify::AGENT_HTTP
+        name = 'AgentHTTPSender worker'
+      end
       @name = name
       @name += " ##{self.id}"
       @type = :logs_send

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-api-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler