Bug 967504 #2900
Bug 967504 #2900
Conversation
| @@ -175,7 +175,7 @@ def request(method, path, *arguments) | |||
| rescue OpenSSL::SSL::SSLError => e | |||
| raise SSLError.new(e.message) | |||
| rescue Net::HTTP::Persistent::Error => e | |||
| raise ConnectionError.new(e.message) | |||
| raise e.message.include?('Timeout::Error') ? TimeoutError.new(e.message) : ConnectionError.new(e.message) | |||
There was a problem hiding this comment.
will e.message ever be nil?
There was a problem hiding this comment.
Parsing the exception message is not exactly the most elegant solution but needed since we don't get a proper Timeout::Error here.
There was a problem hiding this comment.
Don't think it will ever be nil, but I'll add a check anyway.
|
@liggitt @smarterclayton Ok, ready to merge. |
|
Reviewed, [merge] |
|
Online Merge Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/merge_pull_requests/3014/) (Image: devenv_3393) |
|
[Test]ing while waiting on the merge queue |
|
Origin Test Results: Waiting for stable build of 'origin_ami' |
|
Online Test Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/test_pull_requests/3218/) |
|
Evaluated for online up to 6cc7880 |
Merged by openshift-bot
No description provided.