hot_catch 0.1.6.1 → 0.1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b38dfaafae84edd22383bef751198ef839a9744
-  data.tar.gz: 77b85ca8d3b6ab1dff8a6cc250444def2f0d3b25
+  metadata.gz: f70731b11f532a8b696a9a5d0b856aaaa96fd874
+  data.tar.gz: 15d133308c41ab3d8e816a1d11af74d53252e61d
 SHA512:
-  metadata.gz: 66f337e630fcbe01f0a6919b73a4ede2b1dc4fc18c55541ba2a4a51c5fd4dc5acb3a8e6da2e7f1f43ee277185c2167ef56ebdfbf09dbda868b059869acc0f6f5
-  data.tar.gz: 2efb4b9df0ee8a6e16687379152edb9b94cfa5b99b73b54fb13755f70e38f0a9ebf3c00cccaa20eec1ce8b10cf2b24d7773486381dad4a30f08ed2f18859c492
+  metadata.gz: 5107635fb617db5ce4f44976ed253c6deff86f1fb4a27b2829a46bf519941783a83375199e6b04a99c3da981c3c68742eae8d6720f1d06460d944eec71aab7c3
+  data.tar.gz: b7f5d8aa157b8c9837d8d3913168f99988f222254a555d65e776d28fe1d731372b2dd27ee45c1287c4c30fbb8e406ce81441e4abf8f7e7d7366aade373b161f6

data/lib/generators/hot_catch/install_generator.rb

@@ -36,8 +36,7 @@ module HotCatch
       create_file "config/initializers/hot_catch_sender_logs.rb" do
         "require 'sidekiq-cron'\n" +
         "Rails.application.config.sender_logs = HotCatch::MakeHttpsRequest.new\n" +
-        "Sidekiq::Cron::Job.create(name: 'NginxWorker - every 5min', cron: '*/5 * * * *', class: 'NginxWorker')\n" +
-        "Sidekiq::Cron::Job.create(name: 'NginxWorker - every 5min', cron: '*/1 * * * *', class: 'SystemWorker')\n"
+        "Sidekiq::Cron::Job.create(name: 'NginxSystemWorker - every 1min', cron: '*/1 * * * *', class: 'NginxSystemWorker')\n" +
       end
     end
 

data/lib/hot_catch/{system_worker.rb → nginx_system_worker.rb}

@@ -1,11 +1,15 @@
 require 'sidekiq'
-# Отвечает за сбор и отправку логов системы
-class SystemWorker
+# Отвечает за сбор и отправку логов Nginx и системы
+class NginxSystemWorker
   include Sidekiq::Worker
   sidekiq_options :retry => false
   def perform
     logs = get_system_metrics()
     sender = HotCatch::MakeHttpsRequest.new
     sender.system_g_log(logs)
+
+    logs = get_nginx_logs()
+    sender = HotCatch::MakeHttpsRequest.new
+    sender.nginx_g_log(logs)
   end
 end

data/lib/hot_catch/version.rb

@@ -1,3 +1,3 @@
 module HotCatch
-  VERSION = '0.1.6.1'
+  VERSION = '0.1.6.2'
 end

data/lib/hot_catch.rb

@@ -1,7 +1,6 @@
 module HotCatch
   require 'hot_catch/hard_worker'
-  require 'hot_catch/nginx_worker'
-  require 'hot_catch/system_worker'
+  require 'hot_catch/nginx_system_worker'
   require 'hot_catch/custom_log_subscribers.rb'
   require 'hot_catch/get_nginx_logs.rb'
   require 'hot_catch/get_system_metrics'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hot_catch
 version: !ruby/object:Gem::Version
-  version: 0.1.6.1
+  version: 0.1.6.2
 platform: ruby
 authors:
 - Davhot
@@ -70,8 +70,7 @@ files:
 - lib/hot_catch/get_system_metrics.rb
 - lib/hot_catch/hard_worker.rb
 - lib/hot_catch/hot_catch_logger.rb
-- lib/hot_catch/nginx_worker.rb
-- lib/hot_catch/system_worker.rb
+- lib/hot_catch/nginx_system_worker.rb
 - lib/hot_catch/version.rb
 - lib/tasks/hot_catch_tasks.rake
 homepage: https://myhomepage.com

data/lib/hot_catch/nginx_worker.rb

@@ -1,11 +0,0 @@
-require 'sidekiq'
-# Отвечает за сбор и отправку логов Nginx
-class NginxWorker
-  include Sidekiq::Worker
-  sidekiq_options :retry => false
-  def perform
-    logs = get_nginx_logs()
-    sender = HotCatch::MakeHttpsRequest.new
-    sender.nginx_g_log(logs)
-  end
-end