BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
ead94db6
Commit
ead94db6
authored
May 24, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mrchrisw-catch-openssl' into 'master'
Rescue OpenSSL::SSL::SSLError in JiraService See merge request !11467
parents
e6ac98a3
8c071842
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
issue_tracker_service.rb
app/models/project_services/issue_tracker_service.rb
+1
-1
jira_service.rb
app/models/project_services/jira_service.rb
+1
-1
mrchrisw-catch-openssl.yml
changelogs/unreleased/mrchrisw-catch-openssl.yml
+4
-0
No files found.
app/models/project_services/issue_tracker_service.rb
View file @
ead94db6
...
...
@@ -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
)
...
...
app/models/project_services/jira_service.rb
View file @
ead94db6
...
...
@@ -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
...
...
changelogs/unreleased/mrchrisw-catch-openssl.yml
0 → 100644
View file @
ead94db6
---
title
:
Rescue OpenSSL::SSL::SSLError in JiraService & IssueTrackerService
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment