hot_catch 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30ed8cb373a76a5c27b352bb56a5f0694bf4f7e
-  data.tar.gz: 7938dab531e6cde13405ea25831f5097f1a6a75a
+  metadata.gz: 5e967ecad6a61c73d819ae49740dfd6a699d82bc
+  data.tar.gz: d52e3f714e75b020432cdcc210cab29714c9e141
 SHA512:
-  metadata.gz: 8d70f6af9e7b6133465bcb85c9acb36639ca44f9c8522bb5fb598fc69e8a25c3f24fddf006cdf4ee064c4dde5a6e8efe51f3d604ba07cedb050d84ba4a2ec7da
-  data.tar.gz: 6f430732e4f7432361d6c09d0ecc94d873730a3442f49bb6c312a8fcca9b377e9e6d70f876e023dee1ba2524d564251751983fed363b8dbf6ec6a71f2517049c
+  metadata.gz: b322d92ec1115075167542bb45c5a7f743163edf1090b9cf59d2d91e7ae066d9794580c9503ab5e5ccaf671b44ebaf5644e07ed6be8084f02742631721b6152f
+  data.tar.gz: 1fde06ff1e9cb835018e8af381ccd4a667167a8610894176136274b42abf189a12ea09074d2a3927094e513f389023abff934f645b838bcdbc1889c7de5797c8

data/README.md

@@ -11,6 +11,8 @@ gem 'hot_catch'
 Для удаления: `$ rails generate hot_catch:uninstall`
 4. Изменить в `config/hot_catch_config.json` url - адрес сервера для отправки лог файлов.
 Автоматически запросы посылаются на адрес *url/main_hot_catch_logs*, но нужно указать только *url*.
+5. Запустить sidekiq
+`bundle exec sidekiq`
 
 Это всё! Теперь логи автоматически посылаются на сервер.
 

data/lib/generators/hot_catch/install_generator.rb

@@ -7,7 +7,7 @@ module HotCatch
      # Включение всех файлов из указанной папки относительно __FILE__ (то есть текущего файла)
     source_root File.expand_path('../../../hot_catch', __FILE__)
     # include Rails::Generators::Migration
-    
+
     def add_rack_logger
       copy_file "hot_catch_logger.rb", "config/hot_catch_logger.rb"
     end
@@ -37,5 +37,10 @@ module HotCatch
         "Rails.application.config.sender_logs = HotCatch::MakeHttpsRequest.new"
       end
     end
+
+    # def add_sidekiq_job
+    #   empty_directory "app/workers"
+    #   copy_file "hard_worker.rb", "app/workers/hard_worker.rb"
+    # end
   end
 end

data/lib/generators/hot_catch/uninstall_generator.rb

@@ -14,8 +14,8 @@ module HotCatch
       gsub_file "config/application.rb", /require_relative 'hot_catch_logger'/, ""
       gsub_file "config/application.rb", /config.*Logger/, ""
 
-      gsub_file "config/environments/development.rb", /.*\s.*hot_catch_buf_file'\)\)/, ""
-      gsub_file "config/environments/production.rb", /.*\s.*hot_catch_buf_file'\)\)/, ""
+      gsub_file "config/environments/development.rb", /.*\s.*hot_catch_buf_file'\)\)\s*/, ""
+      gsub_file "config/environments/production.rb", /.*\s.*hot_catch_buf_file'\)\)\s*/, ""
     end
 
     def remove_log_files
@@ -30,5 +30,10 @@ module HotCatch
       remove_file "config/initializers/hot_catch_sender_logs.rb"
     end
 
+    # def remove_sidekiq_job
+    #   remove_file "app/workers/hard_worker.rb"
+    #   Dir.delete("app/workers")
+    # end
+
   end
 end

data/lib/hot_catch/hard_worker.rb

@@ -0,0 +1,10 @@
+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
+  end
+end

data/lib/hot_catch/version.rb

@@ -1,3 +1,3 @@
 module HotCatch
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/hot_catch.rb

@@ -1,4 +1,6 @@
 module HotCatch
+  require 'hot_catch/hard_worker'
+
   require 'hot_catch/custom_log_subscribers.rb'
   require 'uri'
   require 'net/https'
@@ -21,10 +23,12 @@ module HotCatch
   # ======================================================================
 
   class MakeHttpsRequest
-    def initialize
-      @url = ""
-      File.open("config/hot_catch_config.json"){ |file| @url = JSON.parse(file.read)["url"] }
-      @url += "/main_hot_catch_logs"
+    def initialize(url = nil)
+      @url = url
+      unless @url
+        File.open("config/hot_catch_config.json"){ |file| @url = JSON.parse(file.read)["url"] }
+        @url += "/main_hot_catch_logs"
+      end
     end
 
     def rails_g_log(log_data, status)
@@ -41,15 +45,21 @@ module HotCatch
     end
 
     def send_log(body_log)
-      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 => '?'
-        }) }
+      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 => '?'
+          }) }
+          HardWorker.perform_in(10.seconds, body_log, @url)
+        end
+      rescue
+        HardWorker.perform_in(10.seconds, body_log, @url)
       end
     end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hot_catch
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Davhot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
-dependencies: []
+date: 2017-09-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description of Testgem.
 email:
 - david.home@mail.ru
@@ -24,6 +38,7 @@ files:
 - lib/generators/hot_catch/uninstall_generator.rb
 - lib/hot_catch.rb
 - lib/hot_catch/custom_log_subscribers.rb
+- lib/hot_catch/hard_worker.rb
 - lib/hot_catch/hot_catch_logger.rb
 - lib/hot_catch/version.rb
 - lib/tasks/hot_catch_tasks.rake