summaryrefslogtreecommitdiff
path: root/lib/rest_client_wrapper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rest_client_wrapper.rb')
-rw-r--r--lib/rest_client_wrapper.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/rest_client_wrapper.rb b/lib/rest_client_wrapper.rb
index adcd5aa..fc2bb19 100644
--- a/lib/rest_client_wrapper.rb
+++ b/lib/rest_client_wrapper.rb
@@ -73,8 +73,7 @@ module OpenTox
if uri.include?(`hostname`.strip)
RestClient.proxy = nil
else
- #RestClient.proxy = ENV['http_proxy'] # set to http proxy uri
- RestClient.proxy = nil
+ CONFIG[:http_proxy] ? RestClient.proxy = CONFIG[:http_proxy] : RestClient.proxy = nil
end
resource = RestClient::Resource.new(uri,{:timeout => 600})