Patch/INV-1229 - Ruby logging issues (#31)

Fix the authorization error issue in Passenger

Author: slashd0t

lib/stackify-api-ruby.rb

@@ -123,7 +123,7 @@ def internal_log level, msg
 
     def run
       Stackify::Utils.is_api_enabled
-      Stackify.internal_log :debug, "Stackify.run = #{Stackify.configuration.transport}"
+      Stackify.internal_log :info, "Stackify.run() transportType = #{Stackify.configuration.transport} | API version: #{Stackify::VERSION}"
       if Stackify.configuration.api_enabled
         if Stackify.is_valid?
           # check transport types
@@ -141,7 +141,6 @@ def run
               when MODES[:metrics]
                 t3 = start_metrics
               end
-
               t1.join
               t3.join if t3
             else

lib/stackify/authorization/authorization_client.rb

@@ -14,16 +14,20 @@ def auth attempts, delay_time= Stackify::ScheduleDelay.new
     end
 
     def auth_task attempts
-      properties = {
-        limit: 1,
-        attempts: attempts,
-        success_condition: lambda do |result|
-          result.try(:status) == 200
+      begin
+        properties = {
+          limit: 1,
+          attempts: attempts,
+          success_condition: lambda do |result|
+            result.try(:status) == 200
+          end
+        }
+        Stackify::ScheduleTask.new properties do
+          Stackify.internal_log :debug, '[AuthorizationClient] trying to authorize...'
+          send_request BASE_URI, Stackify::EnvDetails.instance.auth_info.to_json
         end
-      }
-      Stackify::ScheduleTask.new properties do
-        Stackify.internal_log :debug, '[AuthorizationClient] trying to authorize...'
-        send_request BASE_URI, Stackify::EnvDetails.instance.auth_info.to_json
+      rescue => exception
+        Stackify.log_internal_error "[AuthorizationClient]: An error occured in auth_task!"
       end
     end
   end

lib/stackify/http_client.rb

@@ -25,6 +25,7 @@ def send_request uri, body, headers = HEADERS
                       req.headers = headers
                       req.body = body
                     end
+      return @response
       rescue => ex
         @errors << ex
         Stackify.log_internal_error('HttpClient: ' + ex.message+ ' Backtrace: '+ Stackify::Backtrace.backtrace_in_line(ex.backtrace))

lib/stackify/logger_client.rb

@@ -2,9 +2,14 @@ module Stackify
   class LoggerClient
 
     def initialize
-      @@errors_governor = Stackify::ErrorsGovernor.new
-      @@transport = Stackify::TransportSelector.new(Stackify.configuration.transport).transport
-      return if @@transport.nil?
+      begin
+        @@errors_governor = Stackify::ErrorsGovernor.new
+        @@transport = Stackify::TransportSelector.new(Stackify.configuration.transport).transport
+        Stackify.internal_log :info, "[LoggerClient] initialize: #{@@transport}"
+        return if @@transport.nil?
+      rescue => ex
+        Stackify.log_internal_error "[LoggerClient] initialize exception = #{ex.inspect}"
+      end
     end
 
     def log level, msg, call_trace
@@ -20,6 +25,7 @@ def log_exception level= :error, ex
     end
 
     def get_transport
+      return if @@transport.nil?
       @@transport
     end
 

lib/stackify/transport_selector.rb

@@ -6,9 +6,7 @@ class TransportSelector
     def initialize type
       case type
       when Stackify::DEFAULT
-        Stackify::Utils.do_only_if_authorized_and_mode_is_on Stackify::MODES[:logging] do
-          @transport = Stackify::LogsSender.new
-        end
+        @transport = Stackify::LogsSender.new
       when Stackify::UNIX_SOCKET, Stackify::AGENT_HTTP
         @transport = Stackify::AgentClient.new
       end

lib/stackify/utils/methods.rb

@@ -14,16 +14,20 @@ def self.is_mode_on? mode
   end
 
   def self.do_only_if_authorized_and_mode_is_on mode, &block
-    if Stackify.configuration.api_enabled
-      if Stackify.authorized?
-        if is_mode_on? mode
-          yield
+    begin
+      if Stackify.configuration.api_enabled
+        if Stackify.authorized?
+          if is_mode_on? mode
+            yield
+          else
+            Stackify.internal_log :warn, "[Stackify::Utils] - #{caller[0]}: Skipped because mode - #{mode.to_s} is disabled at configuration"
+          end
         else
-          Stackify.internal_log :warn, "#{caller[0]}: Skipped because mode - #{mode.to_s} is disabled at configuration"
+          Stackify.internal_log :warn, "[Stackify::Utils] - #{caller[0]}: Skipped due to authorization failure"
         end
-      else
-        Stackify.internal_log :warn, "#{caller[0]}: Skipped due to authorization failure"
       end
+    rescue => ex
+      Stackify.internal_log :warn, "[Stackify::Utils] do_only_if_authorized_and_mode_is_on ex: #{ex.inspect}"
     end
   end