stackify-api-ruby 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 74e0dda02b7b3ac9e6df7975565aa43b4bab1442
-  data.tar.gz: 39703a9d159e378cd44d404743e2fe1751686410
+SHA256:
+  metadata.gz: cd19881ee793a2b23b9137218fd184427d9a9502efd1b81ba2064f23626d1228
+  data.tar.gz: 9c3757c006c8f013afb097cf8a0cb7e016f1b1314375dfacfe3bd2d87403a9c8
 SHA512:
-  metadata.gz: 5766ba5b926b029bbf7a85124d89dd7d7e4a14bda5bdb65f063193c9a353102192824087439334ad63bd3b1ac26d569e8c264c13d6fae23793d389482075d605
-  data.tar.gz: b65177fb1f2d277fa304a1084c3cf94b7cc5ff5577f8fdc77c1047e65ad28f21ea7e13ffb485d6e8711aa4fb410c9aa89fb4929bc4b0ed3d6c0aef442b5d8534
+  metadata.gz: bee61b9d0b9b18a3ad4db32dd6b7680b3e6c7db50979cdf1a8f9f222c97465c295474f05c757c734fa26b2082a4e5cbdf541083173c295d0bb48071bc64f04db
+  data.tar.gz: 87ac37dd7b3ec51fc91f79eadad7316c587e25ee2e55844a974437cd4ad731c9ece070178ff51366f6132696cc93bd21c2cdb5eaa8c92df46d8b586ef265415d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackify-api-ruby (1.0.14)
+    stackify-api-ruby (1.0.15)
       faraday (~> 0.8)
 
 GEM

data/lib/stackify-api-ruby.rb

@@ -103,25 +103,27 @@ module Stackify
       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
 

data/lib/stackify/authorization/authorizable.rb

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

data/lib/stackify/authorization/authorization_client.rb

@@ -22,7 +22,7 @@ module Stackify::Authorizable
         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

data/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

data/lib/stackify/http_client.rb

@@ -31,6 +31,5 @@ module Stackify
         false
       end
     end
-
   end
 end

data/lib/stackify/logs_sender.rb

@@ -23,7 +23,7 @@ module Stackify
       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

data/lib/stackify/metrics/metrics_client.rb

@@ -13,6 +13,7 @@ module Stackify::Metrics
     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'

data/lib/stackify/msgs_queue.rb

@@ -2,6 +2,8 @@ module Stackify
   class MsgsQueue < SizedQueue
     include MonitorMixin
 
+    attr_accessor :worker
+
     CHUNK_MIN_WEIGHT = 50
     ERROR_SIZE = 10
     LOG_SIZE = 1
@@ -9,22 +11,27 @@ module Stackify
 
     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 @@ module Stackify
     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 @@ module Stackify
       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 @@ module Stackify
             break
           end
         end
-
         Stackify.logs_sender.send_logs(chunk) if chunk.length > 0
         chunk_weight
       end

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

data/lib/stackify/utils/methods.rb

@@ -10,18 +10,27 @@ module Stackify::Utils
   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

data/lib/stackify/version.rb

@@ -1,3 +1,3 @@
 module Stackify
-  VERSION = '1.0.14'
+  VERSION = '1.0.15'
 end

data/lib/stackify/workers/msgs_queue_worker.rb

@@ -1,7 +1,7 @@
 module Stackify
   class MsgsQueueWorker < Worker
 
-    def initialize name = 'MsgsQueue worker'
+    def initialize name = '[MsgsQueueWorker]'
       super
       @type = :send_msgs
       Stackify.internal_log :info, "#{@name}: started sending logs"

data/lib/stackify/workers/worker.rb

@@ -10,6 +10,7 @@ module Stackify
       @name = name ? name : generate_name
       @name += " ##{self.id}"
       @scheduler = Stackify::Scheduler.new
+      Stackify.internal_log :info, "[Worker] Created worker: #{@name}"
       Stackify.add_dependant_worker self
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-api-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Stackify API for Ruby