hot_catch 0.1.4.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff3f344fc7fd35c18d28fc83c8e54db9adf583f
-  data.tar.gz: 84736194bdb94b432b2d5a436a55b064d23f552e
+  metadata.gz: db8e2f32d740a79b8e344f50fa3346a7c8614fee
+  data.tar.gz: d7a9c3d845ac1bd9109558b1fde39036215de76a
 SHA512:
-  metadata.gz: b1feeb7eec1405f0d5ea1951f2ad586d597a408146f8a83e7d51bafc6ae7d8a4f049b57d0759ff0a1ec4fd07a11e184fb5d67c024ee6da60950a3f791988037a
-  data.tar.gz: 1b908dbd7930cbd5d5adf094a943ae0a17e945adca1b6a359226ba7bb41db4236bcc57f88e755adc96a2f2a83cab320134f2b325de1248b19479acbdf9315127
+  metadata.gz: c49b96f10cb27a39805080ddc1a854ac475f1ddf27167d92ad6f81add2f94ea900dd77e371c037406121f4620074bef26b40be831dc778ce8c1124d86b0fb3f4
+  data.tar.gz: d9446c3a2b474e4d611209174774982998cb7245a85878b694d29204444f1780396df98b18bcec720c67b5f19a77222136fcb3180f1cfb483fcf343d69ba7104

data/lib/generators/hot_catch/install_generator.rb

@@ -34,7 +34,8 @@ module HotCatch
 
     def add_initialize_file_for_sender_logs
       create_file "config/initializers/hot_catch_sender_logs.rb" do
-        "Rails.application.config.sender_logs = HotCatch::MakeHttpsRequest.new"
+        "Rails.application.config.sender_logs = HotCatch::MakeHttpsRequest.new\n" +
+        "Sidekiq::Cron::Job.create(name: 'NginxWorker - every 5min', cron: '*/5 * * * *', class: 'NginxWorker') # execute at every 5 minutes, ex: 12:05, 12:10, 12:15...etc\n"
       end
     end
 

data/lib/hot_catch.rb

@@ -1,7 +1,9 @@
 module HotCatch
   require 'hot_catch/hard_worker'
-
+  require 'hot_catch/nginx_worker'
   require 'hot_catch/custom_log_subscribers.rb'
+  require 'hot_catch/get_nginx_logs.rb'
+
   require 'uri'
   require 'net/https'
   require 'json'
@@ -22,8 +24,10 @@ module HotCatch
   # 5. Ошибки доступны в файле hot_catch_log_response_errors
   # ======================================================================
 
+  # Отвечает за отправку логов на главное приложение
   class MakeHttpsRequest
-    def initialize(url = nil)
+    def initialize(url = nil, try_count = 0)
+      @try_count = try_count
       @url = url
       unless @url
         File.open("config/hot_catch_config.json"){ |file| @url = JSON.parse(file.read)["url"] }
@@ -32,33 +36,39 @@ module HotCatch
     end
 
     def rails_g_log(log_data, status)
-      send_log(
-        {main_hot_catch_log:
-          {
-            "log_data":log_data,
-            "name_app":Rails.application.class.parent_name,
-            "from_log":"Rails",
-            "status":status
-          }
+      body_log = {main_hot_catch_log:
+        {
+          "log_data":log_data,
+          "name_app":Rails.application.class.parent_name,
+          "from_log":"Rails",
+          "status":status
+        }
+      }
+      HardWorker.perform_async(body_log, @url, @try_count)
+    end
+
+    def nginx_g_log(log_data)
+      body_log = {main_hot_catch_log:
+        {
+          "log_data":log_data,
+          "name_app":Rails.application.class.parent_name,
+          "from_log":"Nginx"
         }
-      )
+      }
+      HardWorker.perform_async(body_log, @url, @try_count)
     end
 
     def send_log(body_log)
-      begin
-        response = call(@url, body_log)
-        # если на запрос пришёл ответ, то пришло уведомление об ошибке, которое логируется
-        # Кроме того данное сообщение помещается в очередь и отправляется через какое-то время
-        unless response.empty?
-          str = "\n" + (?-*20) + "\n#{Time.now}\nlogs:\n#{body_log.to_s}\nresponse\n:#{response}\n" + (?-*20) + "\n"
-          File.open("log/hot_catch_log_response_errors", 'a'){ |file| file.write str.encode('UTF-8', {
-            :invalid => :replace,
-            :undef   => :replace,
-            :replace => '?'
-          }) }
-        end
-      rescue
-        HardWorker.perform_in(10.seconds, body_log, @url)
+      response = call(@url, body_log)
+      # если на запрос пришёл ответ, то пришло уведомление об ошибке, которое логируется
+      # Кроме того данное сообщение помещается в очередь и отправляется через какое-то время
+      unless response.empty?
+        str = "\n" + (?-*20) + "\n#{Time.now}\nlogs:\n#{body_log.to_s}\nresponse\n:#{response}\n" + (?-*20) + "\n"
+        File.open("log/hot_catch_log_response_errors", 'a'){ |file| file.write str.encode('UTF-8', {
+          :invalid => :replace,
+          :undef   => :replace,
+          :replace => '?'
+        }) }
       end
     end
 

data/lib/hot_catch/get_nginx_logs.rb

@@ -0,0 +1,18 @@
+require 'time'
+
+def copy_nginx_logs(from_time = (Time.now() - 5 * 60), input_file = 'log/nginx.access.log')
+  str = ""
+  if File.open(input_file, 'r'){|file| str = file.readlines}
+    ind = nil
+
+    for i in 0 ... str.size
+      t = Time.strptime(str[0 - i - 1].match(/\d{2}\/\w+\/\d{4}:\d{2}:\d{2}:\d{2}/)[0], "%d/%b/%Y:%H:%M")
+      if from_time < t
+        ind = 0 - i - 1
+      else
+        break
+      end
+    end
+    ind ? str[ind..-1].join("") : nil
+  end
+end

data/lib/hot_catch/hard_worker.rb

@@ -1,10 +1,26 @@
 require 'sidekiq'
+# Отвечает за отправку логов на главное приложение
 class HardWorker
   include Sidekiq::Worker
-  sidekiq_options :retry => false
-  def perform(body_log, url)
-    sender = HotCatch::MakeHttpsRequest.new(url)
-    sender.send_log(body_log)
-    sender = nil
+  def perform(body_log, url, try_count)
+    if try_count > 15
+      File.open("log/hot_catch_log_response_errors", 'a'){ |file| file.write body_log.encode('UTF-8', {
+        :invalid => :replace,
+        :undef   => :replace,
+        :replace => '?'
+      }) }
+    else
+      sender = HotCatch::MakeHttpsRequest.new(url, try_count + 1)
+      sender.send_log(body_log)
+      sender = nil
+    end
+  end
+
+  def cancelled?
+    Sidekiq.redis {|c| c.exists("cancelled-#{jid}") }
+  end
+
+  def self.cancel!(jid)
+    Sidekiq.redis {|c| c.setex("cancelled-#{jid}", 86400, 1) }
   end
 end

data/lib/hot_catch/nginx_worker.rb

@@ -0,0 +1,11 @@
+require 'sidekiq'
+# Отвечает за сбор и отправку логов Nginx
+class NginxWorker
+  include Sidekiq::Worker
+  sidekiq_options :retry => false
+  def perform
+    logs = copy_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.4.1'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot_catch
 version: !ruby/object:Gem::Version
-  version: 0.1.4.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Davhot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq-cron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 description: Description of Testgem.
 email:
 - david.home@mail.ru
@@ -38,8 +52,10 @@ files:
 - lib/generators/hot_catch/uninstall_generator.rb
 - lib/hot_catch.rb
 - lib/hot_catch/custom_log_subscribers.rb
+- lib/hot_catch/get_nginx_logs.rb
 - lib/hot_catch/hard_worker.rb
 - lib/hot_catch/hot_catch_logger.rb
+- lib/hot_catch/nginx_worker.rb
 - lib/hot_catch/version.rb
 - lib/tasks/hot_catch_tasks.rake
 homepage: https://myhomepage.com