diff options
| author | davor <vorgrimmlerdavid@gmx.de> | 2012-08-28 12:35:14 +0300 |
|---|---|---|
| committer | davor <vorgrimmlerdavid@gmx.de> | 2012-08-28 12:35:14 +0300 |
| commit | a65d7fb418a335739daf33f7950963a011ea0df8 (patch) | |
| tree | 89773cdd54bf24ae00f36e4a80f6dea6c4d5db9b | |
| parent | 2ae3631ccd40df162aa2f1225d4dc47ec7fc9cd4 (diff) | |
Read http proxy from config/production.yamlnestle
| -rw-r--r-- | lib/rest_client_wrapper.rb | 3 |
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}) |