Implement Helpers::GD_MAX_RETRY

gooddata · Dec 1, 2016 · 697df15 · 697df15
1 parent d8afd81
commit 697df15
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # GoodData Ruby SDK Changelog
 
+## 0.6.49
+- Implement Helpers::GD_MAX_RETRY to allow max retries override
+
 ## 0.6.48
 - Fix jruby issue with uninitialized constant GoodData::Rest::Connection::ConnectionHelper
 

diff --git a/lib/gooddata/helpers/global_helpers.rb b/lib/gooddata/helpers/global_helpers.rb
@@ -9,6 +9,7 @@
 require 'hashie'
 require 'openssl'
 
+require_relative '../extensions/object'
 require_relative 'global_helpers_params'
 
 module GoodData
@@ -17,6 +18,8 @@ class DeepMergeableHash < Hash
       include Hashie::Extensions::DeepMerge
     end
 
+    set_const :GD_MAX_RETRY, (ENV['GD_MAX_RETRY'] && ENV['GD_MAX_RETRY'].to_i) || 3
+
     class << self
       def error(msg)
         STDERR.puts(msg)

diff --git a/lib/gooddata/rest/client.rb b/lib/gooddata/rest/client.rb
@@ -7,6 +7,7 @@
 require 'rest-client'
 
 require_relative '../helpers/auth_helpers'
+require_relative '../helpers/global_helpers'
 
 require_relative 'connection'
 require_relative 'object_factory'
@@ -329,7 +330,7 @@ def poll_on_response(link, options = {}, &bl)
             fail ExecutionLimitExceeded, "The time limit #{time_limit} secs for polling on #{link} is over"
           end
           sleep sleep_interval
-          GoodData::Rest::Client.retryable(:tries => ConnectionHelper::GD_MAX_RETRY, :refresh_token => proc { connection.refresh_token }) do
+          GoodData::Rest::Client.retryable(:tries => Helpers::GD_MAX_RETRY, :refresh_token => proc { connection.refresh_token }) do
             response = get(link, process: process)
           end
         end

diff --git a/lib/gooddata/rest/connection.rb b/lib/gooddata/rest/connection.rb
@@ -13,6 +13,8 @@
 require_relative '../version'
 require_relative '../exceptions/exceptions'
 
+require_relative '../helpers/global_helpers'
+
 module RestClient
   module AbstractResponse
     alias_method :old_follow_redirection, :follow_redirection
@@ -288,7 +290,7 @@ def download(what, where, options = {})
           end
         end
 
-        GoodData::Rest::Connection.retryable(:tries => ConnectionHelper::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
+        GoodData::Rest::Connection.retryable(:tries => Helpers::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
           if where.is_a?(IO) || where.is_a?(StringIO)
             b.call(where)
           else
@@ -486,7 +488,7 @@ def create_webdav_dir_if_needed(url)
           RestClient::Request.execute(raw)
         end
 
-        GoodData::Rest::Connection.retryable(:tries => ConnectionHelper::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
+        GoodData::Rest::Connection.retryable(:tries => Helpers::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
           b.call
         end
       end
@@ -543,7 +545,7 @@ def merge_headers!(headers)
       end
 
       def process_response(options = {}, &block)
-        retries = options[:tries] || 3 # ConnectionHelper::GD_MAX_RETRY
+        retries = options[:tries] || Helpers::GD_MAX_RETRY
         process = options[:process]
         dont_reauth = options[:dont_reauth]
         options = options.reject { |k, _| [:process, :dont_reauth].include?(k) }
@@ -700,7 +702,7 @@ def webdav_dir_exists?(url)
         method = :get
         GoodData.logger.debug "#{method}: #{url}"
 
-        GoodData::Rest::Connection.retryable(:tries => ConnectionHelper::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
+        GoodData::Rest::Connection.retryable(:tries => Helpers::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
           raw = {
             :method => method,
             :url => url,

diff --git a/lib/gooddata/version.rb b/lib/gooddata/version.rb
@@ -6,7 +6,7 @@
 
 # GoodData Module
 module GoodData
-  VERSION = '0.6.48'
+  VERSION = '0.6.49'
 
   class << self
     # Version

diff --git a/spec/environment/default.rb b/spec/environment/default.rb
@@ -12,7 +12,7 @@ module GoodData
   module Environment
     module ConnectionHelper
       set_const :GD_PROJECT_TOKEN, ENV["GD_PROJECT_TOKEN"]
-      set_const :GD_MAX_RETRY, (ENV["GD_MAX_RETRY"] && ENV["GD_MAX_RETRY"].to_i) || 3
+      set_const :GD_MAX_RETRY, Helpers::GD_MAX_RETRY
 
       set_const :DEFAULT_USERNAME, "[email protected]"
       set_const :TEST_USERNAME, "[email protected]"