adds schedule_delay instead of fixed period

Author: v-dolgishev

.ruby-gemset

@@ -0,0 +1 @@
+stackify-api-ruby

.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.2

Gemfile.lock

@@ -1,11 +1,15 @@
 PATH
   remote: .
   specs:
-    stackify-api-ruby (1.0.2)
+    stackify-api-ruby (1.0.3)
+      faraday (>= 0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    multipart-post (2.0.0)
     rake (0.9.6)
 
 PLATFORMS

README.md

@@ -62,11 +62,7 @@ You can set minimal level of logs, which should be caught by gem:
 
 If you want to use proxy for sending request, you can do it in such way:
 
-    config.with_proxy = true
-    config.proxy_host = "127.0.0.1"
-    config.proxy_port = "8118"
-    config.proxy_user = nil
-    config.proxy_pass = nil
+    config.proxy = { uri: '127.0.0.1:8118', user: 'user_name', password: 'some_password' }
 
 For internal logging stackify-api-ruby uses such logger:
 

lib/generators/stackify/templates/stackify.rb

@@ -6,9 +6,5 @@
   #config.log_level = :error
   #config.logger = Logger.new(File.join(Rails.root, 'log', 'stackify.log'))
   #config.logger.level = Logger::INFO
-  #config.with_proxy = false
-  #config.proxy_host = '127.0.0.1'
-  #config.proxy_port = '8118'
-  #config.proxy_user = nil
-  #config.proxy_pass = nil
+  #config.proxy = {uri: '127.0.0.1:8118', user: 'user_name', password: 'some_password'}
 end

lib/stackify-api-ruby.rb

@@ -16,9 +16,11 @@ module Stackify
   autoload :EnvDetails,           'stackify/env_details'
   autoload :Scheduler,            'stackify/scheduler'
   autoload :ScheduleTask,         'stackify/schedule_task'
+  autoload :ScheduleDelay,        'stackify/schedule_delay'
   autoload :Worker,               'stackify/workers/worker'
   autoload :AuthWorker,           'stackify/workers/auth_worker'
   autoload :LogsSenderWorker,     'stackify/workers/logs_sender_worker'
+  autoload :MsgsQueueWorker,      'stackify/workers/msgs_queue_worker'
   autoload :AddMsgWorker,         'stackify/workers/add_msg_worker'
   autoload :MsgsQueue,            'stackify/msgs_queue'
   autoload :LoggerClient,         'stackify/logger_client'
@@ -123,7 +125,7 @@ def run async = true
     end
 
     def start_logging
-      Thread.new { Stackify.logs_sender.start}
+      msgs_queue
     end
 
     def start_metrics

lib/stackify/authorization/authorizable.rb

@@ -10,11 +10,11 @@ module ClassMethods
     @@auth_lock = Mutex.new
     @@auth_client = nil
 
-    def authorize attempts=3, delay_time = 20
+    def authorize attempts=3
       @@auth_lock.synchronize do
         return unless @@auth_client.nil?
         @@auth_client = Stackify::Authorizable::AuthorizationClient.new
-        @@auth_client.auth attempts, delay_time
+        @@auth_client.auth attempts
       end
     end
 
@@ -53,7 +53,7 @@ def if_not_authorized failure_msg, &block
 
     def response_string r
       return '' if r.nil?
-      "Code: #{r.try(:code)}, Message: '#{r.try(:msg)}'"
+      "Status: #{r.try(:status)}, Message: '#{r.try(:body)}'"
     end
 
   end

lib/stackify/authorization/authorization_client.rb

@@ -8,7 +8,7 @@ def initialize
       @worker = Stackify::AuthWorker.new
     end
 
-    def auth attempts, delay_time= 20
+    def auth attempts, delay_time= Stackify::ScheduleDelay.new
       task = auth_task attempts
       @worker.perform delay_time, task
     end
@@ -18,7 +18,7 @@ def auth_task attempts
         limit: 1,
         attempts: attempts,
         success_condition: lambda do |result|
-          result.try(:code) == '200'
+          result.try(:status) == 200
         end
       }
       Stackify::ScheduleTask.new properties do

lib/stackify/errors_governor.rb

@@ -1,6 +1,7 @@
+require 'digest'
+
 module Stackify
   class ErrorsGovernor
-    require 'digest'
 
     def initialize purge_period=5
       @history = {}
@@ -17,7 +18,7 @@ def can_send? ex
         history_entry = @history[key]
         if history_entry[:epoch_minute] == epoch_minute
           history_entry[:count] += 1
-          answer = (history_entry[:count] <= Stackify.configuration.flood_limit) ? true : false
+          answer = history_entry[:count] <= Stackify.configuration.flood_limit
         else
           @history[key]={
             epoch_minute: epoch_minute,

lib/stackify/http_client.rb

@@ -1,6 +1,6 @@
 require 'uri'
-require 'net/http'
-require 'net/https'
+require 'faraday'
+
 module Stackify
   class HttpClient
 
@@ -16,32 +16,21 @@ class HttpClient
     def send_request uri, body, headers = HEADERS
       @errors = []
       begin
-        https = get_https uri
-        req = Net::HTTP::Post.new uri.path, initheader = headers
-        req.body = body
+        conn = Faraday.new(proxy: Stackify.configuration.proxy)
         Stackify.internal_log :debug, "============Request body=========================="
-        Stackify.internal_log :debug, req.body
+        Stackify.internal_log :debug, body
         Stackify.internal_log :debug, "=================================================="
-        @response = https.request req
-       rescue => ex
+        @response = conn.post do |req|
+                      req.url URI(uri)
+                      req.headers = headers
+                      req.body = body
+                    end
+      rescue => ex
         @errors << ex
         Stackify.log_internal_error('HttpClient: ' + ex.message+ ' Backtrace: '+ Stackify::Backtrace.backtrace_in_line(ex.backtrace))
         false
       end
     end
 
-    def get_https uri
-      if Stackify.configuration.with_proxy
-        https = Net::HTTP.new uri.host, uri.port,
-                Stackify.configuration.proxy_host,
-                Stackify.configuration.proxy_port,
-                Stackify.configuration.proxy_user,
-                Stackify.configuration.proxy_pass
-      else
-        https = Net::HTTP.new uri.host, uri.port
-      end
-      https.use_ssl = true
-      https
-    end
   end
 end