diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-24 13:14:34 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-24 13:14:34 +0000 |
| commit | ead94db602f6f2e4d3b790bd4c7e645494d72318 (patch) | |
| tree | b9bb0f64f40a6f6337d95558851391d1e4b09365 | |
| parent | e6ac98a3234b4ff094b1b4d7817e9376640163e3 (diff) | |
| parent | 8c07184250166cd206c0e6a9f5cf686b7de8f65d (diff) | |
| download | gitlab-ce-ead94db602f6f2e4d3b790bd4c7e645494d72318.tar.gz | |
Merge branch 'mrchrisw-catch-openssl' into 'master'
Rescue OpenSSL::SSL::SSLError in JiraService
See merge request !11467
| -rw-r--r-- | app/models/project_services/issue_tracker_service.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/jira_service.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/mrchrisw-catch-openssl.yml | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb index 50435b67eda..eddf308eae3 100644 --- a/app/models/project_services/issue_tracker_service.rb +++ b/app/models/project_services/issue_tracker_service.rb @@ -76,7 +76,7 @@ class IssueTrackerService < Service message = "#{self.type} received response #{response.code} when attempting to connect to #{self.project_url}" result = true end - rescue HTTParty::Error, Timeout::Error, SocketError, Errno::ECONNRESET, Errno::ECONNREFUSED => error + rescue HTTParty::Error, Timeout::Error, SocketError, Errno::ECONNRESET, Errno::ECONNREFUSED, OpenSSL::SSL::SSLError => error message = "#{self.type} had an error when trying to connect to #{self.project_url}: #{error.message}" end Rails.logger.info(message) diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index f388773efee..a91a986e195 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -294,7 +294,7 @@ class JiraService < IssueTrackerService def jira_request yield - rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, URI::InvalidURIError, JIRA::HTTPError => e + rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, URI::InvalidURIError, JIRA::HTTPError, OpenSSL::SSL::SSLError => e Rails.logger.info "#{self.class.name} Send message ERROR: #{url} - #{e.message}" nil end diff --git a/changelogs/unreleased/mrchrisw-catch-openssl.yml b/changelogs/unreleased/mrchrisw-catch-openssl.yml new file mode 100644 index 00000000000..a8b433fb0cd --- /dev/null +++ b/changelogs/unreleased/mrchrisw-catch-openssl.yml @@ -0,0 +1,4 @@ +--- +title: Rescue OpenSSL::SSL::SSLError in JiraService & IssueTrackerService +merge_request: +author: |