hot_catch 0.1.5.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fac3fb866a894a8ebc659e2591cad9c8b1e74fa
-  data.tar.gz: 2805d10c532f13b9b4a7967e90f940610d99d459
+  metadata.gz: 2ffd4e525003d19c6df28482eecd732735d665ba
+  data.tar.gz: 1a7851f99b056f4ebffbf7ef3bc5b434e7a87a22
 SHA512:
-  metadata.gz: 79e8587e8520edb3c8042c96c24ae2ca107296e0ba94c4b223fac032ed1e5ce79f4190b40894fd207f5fc7912fb965c5f4f2c3057cc3295658713fce4dfe1e04
-  data.tar.gz: ac119a9263d715319a2ad22321b4fe456caafc3ee33eff63c4c4da0e8e7d734a00c0dd17f56326deba682aa8eb209c21ba8447cbdc47f92f202685eadc59f6d1
+  metadata.gz: 5d558f2d46414bd9f35718a1f16c9159bacdfb5f0289662ae3f59474d5d2dc96c38fc8fba63a086f4ea5ad3da564460add40cb03c07fb02f9bbff762d94ae1d7
+  data.tar.gz: 53bc4cf7ab9cabd097871c2838411af0cce13f001de6c5264a0a28b8799df64712baae6db6ef0fc1803c931b85ceee13f9a057631fa46cba315ba1aa34767ebb

data/lib/generators/hot_catch/install_generator.rb

@@ -36,7 +36,8 @@ 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') # execute at every 5 minutes, ex: 12:05, 12:10, 12:15...etc\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"
       end
     end
 

data/lib/hot_catch/get_nginx_logs.rb

@@ -1,18 +1,64 @@
 require 'time'
+=begin
+  Принцип получения логов (сделано так, чтобы не потерять логи за секунду между интервалами выборок):
+  1. Время последнего получения логов хранится в файле tmp/hot_catch_from_time.txt
+  2. Сами логи хранятся в файле log/nginx.access.log
+  3. Логи берутся от времени последнего получения логов минус одна секунда и до лога
+    время которого меньше текущего минус одна секунда
+    (интервал смещён для точной передачи всех данных за время t - 1 секунда)
+  4. Если нет файла tmp/hot_catch_from_time.txt или он пустой, берутся все логи
+    от начала до последнего лога, время которого меньше текущего минус одна секунда.
+=end
 
-def copy_nginx_logs(from_time = (Time.now() - 5 * 60), input_file = 'log/nginx.access.log')
-  str = ""
-  if File.exist?(input_file) && File.open(input_file, 'r'){|file| str = file.readlines}
-    ind = nil
+def get_ind_log_from_now_minus_one_second(logs, now)
+  logs.reverse.each_with_index do |elem, index|
+    t = Time.strptime(logs[0 - index - 1].match(/\d{2}\/\w+\/\d{4}:\d{2}:\d{2}:\d{2}/)[0], "%d/%b/%Y:%H:%M:%S")
+    if t < (now - 1)
+      return (logs.size - 1 - index)
+    end
+  end
+  nil # все логи удовлетворяют выборке
+end
 
-    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
+def get_nginx_logs(from_time_file = 'tmp/hot_catch_from_time.txt', input_file = 'log/nginx.access.log')
+  from_time = ""
+  if File.exist?(from_time_file) && File.open(from_time_file, 'r'){|file| from_time = file.read } && !from_time.empty?
+    from_time = Time.parse(from_time) - 1
+    logs = ""
+    if File.exist?(input_file) && File.open(input_file, 'r'){|file| logs = file.readlines} && !logs.empty?
+      now = Time.now
+      from_ind = nil
+      for i in 0 ... logs.size
+        t = Time.strptime(logs[0 - i - 1].match(/\d{2}\/\w+\/\d{4}:\d{2}:\d{2}:\d{2}/)[0], "%d/%b/%Y:%H:%M:%S")
+        if from_time <= t
+          from_ind = 0 - i - 1
+        else
+          break
+        end
+      end
+      logs = from_ind ? logs[from_ind..-1] : ""
+      if !logs.empty?
+        to_ind = get_ind_log_from_now_minus_one_second(logs, now)
+        logs = to_ind ? logs[0..to_ind] : ""
       end
+
+      File.open(from_time_file, 'w'){|file| file.write now}
+      logs.empty? ? logs : logs.join("")
+    end
+  else
+    logs = ""
+    if File.exist?(input_file) && File.open(input_file, 'r'){|file| logs = file.readlines}
     end
-    ind ? str[ind..-1].join("") : nil
+    now = Time.now
+    if !logs.empty?
+      ind = get_ind_log_from_now_minus_one_second(logs, now)
+      puts ind
+      logs = ind ? logs[0..ind] : ""
+      File.open(from_time_file, 'w'){|file| file.write now}
+      logs.join("")
+    end
+    logs
   end
 end
+
+puts get_nginx_logs

data/lib/hot_catch/get_system_metrics.rb

@@ -0,0 +1,27 @@
+require 'server_metrics'
+require 'time'
+
+def parse_descriptors_info
+	descriptors = `cat /proc/sys/fs/file-nr`
+	descriptors = descriptors.strip.split("\t").map(&:to_i)
+	{current: descriptors[0], unused: descriptors[1], max: descriptors[2]}
+end
+
+def get_system_metrics
+	metrics = [ServerMetrics::Network, ServerMetrics::Cpu, ServerMetrics::Disk, ServerMetrics::Memory]
+	metrics_human_name = ["network", "cpu", "disk", "memory", "system_info", "descriptors", "time"]
+	result = {}
+
+	metrics.each_with_index do |m, index|
+		metric = m.new
+		metric.run
+		sleep 1 if m == ServerMetrics::Network || m == ServerMetrics::Cpu
+		metric.build_report
+		result[metrics_human_name[index]] = metric.data
+	end
+	result[metrics_human_name[-3]] = ServerMetrics::SystemInfo.to_h
+	result[metrics_human_name[-2]] = parse_descriptors_info
+	result[metrics_human_name[-1]] = Time.now
+
+	result
+end

data/lib/hot_catch/nginx_worker.rb

@@ -4,7 +4,7 @@ class NginxWorker
   include Sidekiq::Worker
   sidekiq_options :retry => false
   def perform
-    logs = copy_nginx_logs()
+    logs = get_nginx_logs()
     sender = HotCatch::MakeHttpsRequest.new
     sender.nginx_g_log(logs)
   end

data/lib/hot_catch/system_worker.rb

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

data/lib/hot_catch/version.rb

@@ -1,3 +1,3 @@
 module HotCatch
-  VERSION = '0.1.5.1'
+  VERSION = '0.1.6'
 end

data/lib/hot_catch.rb

@@ -1,8 +1,10 @@
 module HotCatch
   require 'hot_catch/hard_worker'
   require 'hot_catch/nginx_worker'
+  require 'hot_catch/system_worker'
   require 'hot_catch/custom_log_subscribers.rb'
   require 'hot_catch/get_nginx_logs.rb'
+  require 'hot_catch/get_system_metrics'
 
   require 'uri'
   require 'net/https'
@@ -58,11 +60,22 @@ module HotCatch
       HardWorker.perform_async(body_log, @url, @try_count)
     end
 
+    def system_g_log(log_data)
+      body_log = {main_hot_catch_log:
+        {
+          "log_data":log_data,
+          "name_app":Rails.application.class.parent_name,
+          "from_log":"System"
+        }
+      }
+      HardWorker.perform_async(body_log, @url, @try_count)
+    end
+
     def send_log(body_log)
       response = call(@url, body_log)
       # если на запрос пришёл ответ, то пришло уведомление об ошибке, которое логируется
       # Кроме того данное сообщение помещается в очередь и отправляется через какое-то время
-      unless response.empty?
+      unless response.to_s.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,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot_catch
 version: !ruby/object:Gem::Version
-  version: 0.1.5.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Davhot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: server_metrics
+  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
@@ -53,9 +67,11 @@ files:
 - lib/hot_catch.rb
 - lib/hot_catch/custom_log_subscribers.rb
 - lib/hot_catch/get_nginx_logs.rb
+- 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/version.rb
 - lib/tasks/hot_catch_tasks.rake
 homepage: https://myhomepage.com