Rspec issue (#25)

* RT-2599 Fix the authorization error issue in Passenger

* Disable the stackify api instance when a rake or spec command is executed

Author: slashd0t

lib/stackify-api-ruby.rb

@@ -103,25 +103,27 @@ def internal_log level, msg
       Stackify.logger.send(level.downcase.to_sym, Stackify::INTERNAL_LOG_PREFIX){ msg }
     end
 
-    def run async = true
-      if Stackify.is_valid?
-        at_exit { make_remained_job }
-         t1 = Thread.new { Stackify.authorize }
-        case Stackify.configuration.mode
-        when MODES[:both]
-          t2 = start_logging
-          t3 = start_metrics
-        when MODES[:logging]
-          t2 = start_logging
-        when MODES[:metrics]
-          t3 = start_metrics
-        end
-        unless async
+    def run
+      Stackify::Utils.is_api_enabled
+      if Stackify.configuration.api_enabled
+        if Stackify.is_valid?
+          at_exit { make_remained_job }
+           t1 = Thread.new { Stackify.authorize }
+          case Stackify.configuration.mode
+          when MODES[:both]
+            t2 = start_logging
+            t3 = start_metrics
+          when MODES[:logging]
+            t2 = start_logging
+          when MODES[:metrics]
+            t3 = start_metrics
+          end
+
           t1.join
-          t2.join if t2
+          t3.join if t3
+        else
+          Stackify.log_internal_error "Stackify is not properly configured! Errors: #{Stackify.configuration.errors}"
         end
-      else
-        Stackify.log_internal_error "Stackify is not properly configured! Errors: #{Stackify.configuration.errors}"
       end
     end
 

lib/stackify/authorization/authorizable.rb

@@ -56,7 +56,5 @@ def response_string r
       return '' if r.nil?
       "Status: #{r.try(:status)}, Message: '#{r.try(:body)}'"
     end
-
   end
-
 end

lib/stackify/authorization/authorization_client.rb

@@ -22,7 +22,7 @@ def auth_task attempts
         end
       }
       Stackify::ScheduleTask.new properties do
-        Stackify.internal_log :debug, 'AthorizationClient: trying to authorize...'
+        Stackify.internal_log :debug, '[AuthorizationClient] trying to authorize...'
         send_request BASE_URI, Stackify::EnvDetails.instance.auth_info.to_json
       end
     end

lib/stackify/engine.rb

@@ -3,7 +3,6 @@ module Stackify
   class Engine < ::Rails::Engine
 
     if Rails.version > '3.1'
-
       initializer 'Stackify set up of logger', group: :all do
         ::Rails.logger = ::Stackify::LoggerProxy.new ::Rails.logger
         Stackify.run

lib/stackify/http_client.rb

@@ -31,6 +31,5 @@ def send_request uri, body, headers = HEADERS
         false
       end
     end
-
   end
 end

lib/stackify/logs_sender.rb

@@ -23,7 +23,7 @@ def send_logs_task attempts = nil, msgs
       Stackify::ScheduleTask.new properties do
         failure_msg = 'LogsSender: tried to send logs'
         Stackify.if_not_authorized failure_msg do
-          Stackify.internal_log :info, 'LogsSender: trying to send logs to Stackify...'
+          Stackify.internal_log :info, '[LogsSender] trying to send logs to Stackify...'
           send_request LOGS_URI, gather_and_pack_data(msgs).to_json
         end
       end

lib/stackify/metrics/metrics_client.rb

@@ -13,6 +13,7 @@ def initialize
     end
 
     def start
+      Stackify.internal_log :debug, '[MetricClient]: start'
       if Stackify::Utils.is_mode_on? Stackify::MODES[:metrics]
         worker = Stackify::Worker.new 'Metrics client - processing of metrics'
         Stackify.internal_log :debug, 'Metrics client: processing of metrics is started'

lib/stackify/msgs_queue.rb

@@ -2,29 +2,36 @@ module Stackify
   class MsgsQueue < SizedQueue
     include MonitorMixin
 
+    attr_accessor :worker
+
     CHUNK_MIN_WEIGHT = 50
     ERROR_SIZE = 10
     LOG_SIZE = 1
     DELAY_WAITING = 1
 
     def initialize
       super(Stackify.configuration.queue_max_size)
+      start_worker
+    end
+
+    alias :old_push :push
+
+    def start_worker
       if Stackify::Utils.is_mode_on? Stackify::MODES[:logging]
         @send_interval = ScheduleDelay.new
-        worker = MsgsQueueWorker.new
+        @worker = MsgsQueueWorker.new
         task = update_send_interval_task
-        worker.async_perform @send_interval, task
+        @worker.async_perform @send_interval, task
       else
         Stackify.internal_log :warn, '[MsgsQueue]: Logging is disabled at configuration!'
       end
     end
 
-    alias :old_push :push
-
     def push_remained_msgs
+      Stackify.internal_log :debug, "[MsgsQueue] push_remained_msgs() alive? = #{@worker.alive?}"
       wait_until_all_workers_will_add_msgs
       self.synchronize do
-        Stackify.internal_log :info, 'All remained logs are going to be sent'
+        Stackify.internal_log :info, '[MsgsQueue] All remained logs are going to be sent'
         Stackify.shutdown_all
         if self.length > 0
           Stackify.logs_sender.send_logs(pop_all)
@@ -34,6 +41,11 @@ def push_remained_msgs
     end
 
     def add_msg msg
+      Stackify.internal_log :debug, "[MsgsQueue] add_msg() Is worker <#{@worker.name}> alive? = #{@worker.alive?}"
+      if !@worker.alive?
+        start_worker
+        Stackify.internal_log :debug, "[MsgsQueue] add_msg() Newly created worker <#{@worker.name}>"
+      end
       self.synchronize do
         Stackify::Utils.do_only_if_authorized_and_mode_is_on Stackify::MODES[:logging] do
           old_push(msg)
@@ -73,7 +85,6 @@ def update_send_interval_task
       Stackify::ScheduleTask.new properties do
         processed_count = calculate_processed_msgs_count
         i = @send_interval.update_by_sent_num! processed_count
-        Stackify.internal_log :debug, "MsgsQueue: send_interval is updated to #{i}"
         i
       end
     end
@@ -104,7 +115,6 @@ def push_one_chunk
             break
           end
         end
-
         Stackify.logs_sender.send_logs(chunk) if chunk.length > 0
         chunk_weight
       end

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
+                  :proxy, :mode, :base_api_url, :api_enabled
 
     attr_reader :errors, :send_interval, :flood_limit, :queue_max_size
 
@@ -15,6 +15,7 @@ def initialize
       @flood_limit = 100
       @queue_max_size = 10000
       @send_interval = 60
+      @api_enabled = true
       @log_level = :info
       @mode = MODES[:both]
       @logger = Logger.new(STDOUT)

lib/stackify/utils/methods.rb

@@ -10,18 +10,27 @@ def self.rounded_current_time
   end
 
   def self.is_mode_on? mode
-    Stackify.configuration.mode == Stackify::MODES[:both] || Stackify.configuration.mode == mode
+    Stackify.configuration.mode = mode || Stackify::MODES[:both]
   end
 
   def self.do_only_if_authorized_and_mode_is_on mode, &block
-    if Stackify.authorized?
-      if is_mode_on? mode
-        yield
+    if Stackify.configuration.api_enabled
+      if Stackify.authorized?
+        if is_mode_on? mode
+          yield
+        else
+          Stackify.internal_log :warn, "#{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, "#{caller[0]}: Skipped due to authorization failure"
       end
-    else
-      Stackify.internal_log :warn, "#{caller[0]}: Skipped due to authorization failure"
     end
   end
-end
+
+  def self.is_api_enabled
+    exclude = %w/rake rspec irb/
+    cmd = $PROGRAM_NAME.to_s.split('/').pop
+    found = exclude.select{|e| e =~ /#{cmd}/i}
+    Stackify.configuration.api_enabled = false if found.count > 0
+  end
+end