new server and some modifications

Rakefile

@@ -64,7 +64,7 @@ namespace :local do
 
  desc "Stop the application runned with Unicorn."
  task :stop do
- pid = File.open('/home/onliner/current/tmp/pids/unicorn.pid') { |f| f.read }
+ pid = File.open('/home/railiner/current/tmp/pids/unicorn.pid') { |f| f.read }
  system("kill #{pid.strip}")
  puts 'Unicorn killed.'
  end

app/views/info/stats.html.erb

@@ -1,34 +1,29 @@
 <h1>Статистика</h1>
 <hr>
 <input id="button" type="button" value="Обновить" disabled="disabled" autocomplete="off" onclick="getStats();" class="btn btn-primary">
-<p></p>
-<div id="info"></div>
-<div class="progress" id="loading" style="display: none">
- <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div>
-</div>
+<p>
+ <div id="info"></div>
+ <div class="progress" id="loading" style="visibility: hidden">
+ <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div>
+ </div>
+</p>
 
 <script type="text/javascript">
-
  function getStats(){
-
- var info = document.getElementById('info');
- var loading = document.getElementById('loading');
- var button = document.getElementById('button');
-
+ var info = document.getElementById('info'),
+ loading = document.getElementById('loading'),
+ button = document.getElementById('button');
  var xhr = new XMLHttpRequest();
  xhr.open("GET", "<%= xhr_stats_path %>", true);
  xhr.onload = function () {
  info.innerHTML = xhr.responseText;
- loading.style.display = 'none';
+ loading.style.visibility = 'hidden';
  button.removeAttribute("disabled"); 
  };
  xhr.send();
  info.innerHTML = 'Сбор информации...';
- loading.style.display = 'block';
+ loading.style.visibility = 'visible';
  button.setAttribute('disabled', 'disabled');
  }
-
  getStats();
-
 </script>
-

config/deploy.rb

@@ -7,8 +7,8 @@
 # Default branch is :master
 # ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
 # Default deploy_to directory is /var/www/my_app_name
-set :deploy_to, '/home/onliner'
-set :tmp_dir, '/home/onliner/tmp'
+set :deploy_to, '/home/railiner'
+set :tmp_dir, '/home/railiner/tmp'
 # Default value for :scm is :git
 # set :scm, :git
 # Default value for :format is :pretty

config/deploy/production.rb

@@ -6,7 +6,7 @@
 # server 'example.com', user: 'deploy', roles: %w{app db web}, my_property: :my_value
 # server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value
 # server 'db.example.com', user: 'deploy', roles: %w{db}
-server '198.20.105.55', user: 'onliner', roles: %w{app db web}, my_property: :my_value
+server '51.254.10.211', user: 'railiner', roles: %w{app db web}, my_property: :my_value
 
 
 # role-based syntax

lib/parser.rb

@@ -8,6 +8,8 @@
 #main script for saving groups of categories, categories of products and products in database
 class Parser
 
+ include Slack_message
+
  URL = 'https://catalog.onliner.by/'
 
  def initialize(daemon=false, queue=false)
@@ -26,9 +28,8 @@ def queue?
  def run
  begin
  # clear_sidekiq
- Process.daemon if daemon?
- File.open("#{File.expand_path('../../tmp/pids', __FILE__)}/parser.pid", 'w') { |f| f << Process.pid }
- Slack_message.new.send("Parser started by #{ENV['USER']}@#{`hostname`.strip} on #{Time.now}", 'warning')
+ Process.daemon && save_pid if daemon?
+ send_message("Parser started by #{ENV['USER']}@#{`hostname`.strip} on #{Time.now}", 'warning')
  start_stats = stats_now
  Proxies_getter.perform_async('https://xseo.in/freeproxy') if queue?
  html = get_html(URL)
@@ -52,12 +53,16 @@ def run
  results(start_stats, stop_stats)
  rescue => exception
  puts exception.message
- Slack_message.new.send("Parser exception: #{exception.message} on #{Time.now}", 'danger')
+ send_message("Parser exception: #{exception.message} on #{Time.now}", 'danger')
  end
  end #def
 
  private
 
+ def save_pid
+ File.open("#{File.expand_path('../../tmp/pids', __FILE__)}/parser.pid", 'w') { |f| f << Process.pid }
+ end
+
  def check_group(name_ru)
  group_found = Group.find_by(name_ru: name_ru)
  group_found.nil? ? create_group(name_ru) : group_found
@@ -68,8 +73,8 @@ def clear_sidekiq
  Sidekiq.redis { |c| c.del('stat:failed') }
  end
 
- def get_html(source)
- Nokogiri::HTML(Curl.get(source).body)
+ def get_html(url)
+ Nokogiri::HTML(Curl.get(url).body)
  end
 
  def translate_to_en(word)
@@ -102,7 +107,7 @@ def special_request(url)
  http.ssl_verify_peer = false
  http.headers["User-Agent"] = user_agents[rand(user_agents.size)]
  end
- data.body_str
+ data.body
  end
 
  #fetch all products from all the pages of one category
@@ -145,7 +150,7 @@ def results(start_stats, stop_stats)
  time_result = "Done in #{time}"
  db_result = "Got: #{deltas[1]} groups, #{deltas[2]} categories, #{deltas[3]} products"
  puts "#{time_result}\n#{db_result}"
- Slack_message.new.send("Parser finished in #{time}. #{db_result} on #{Time.now}", 'good')
+ send_message("Parser finished in #{time}. #{db_result} on #{Time.now}", 'good')
  end
 
 end

lib/product_comparator.rb

@@ -2,6 +2,8 @@
 
 class Comparator
 
+ include Slack_message
+
  def run(category, product, with_queue, page_url)
  begin
  #product is after JSON.parse 
@@ -17,7 +19,7 @@ def run(category, product, with_queue, page_url)
  rescue => exception
  message = "Exception: #{exception.message} | Failed product: #{product['full_name']} | Page url: #{page_url}"
  puts message
- Slack_message.new.send("#{Time.now} : #{message}", 'danger')
+ send_message("#{Time.now} : #{message}", 'danger')
  raise "Comparator error. Failed to handle the product data."
  end
  end

lib/slack_message.rb

@@ -1,8 +1,8 @@
-require 'curb'
+module Slack_message
 
-class Slack_message
+ require 'curb'
 
- def send(message, status)
+ def send_message(message, status)
  payload = {'color' => status, 'fields' => [{'value' => message}]}.to_json
  Curl.post(ENV["PARSER_HOOK"], payload)
  end