diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-04 01:42:28 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-04 01:42:28 +0300 |
| commit | ca0f107809e8547357d66d6241ee39be86546ecb (patch) | |
| tree | 287e0a3c959d815177d489afa17e942adc22e3be | |
| parent | 46dd5fc47e735bb6fa757fc7c8a8aaef22aa84e5 (diff) | |
| parent | a89d7adfa44767e71cfb9005e5a3eed6a91b4d84 (diff) | |
Merge branch 'webhook-rescue' into 'master'
Webhook rescue Errno::ECONNRESET
Fixes #1821
See merge request !1466
| -rw-r--r-- | app/models/hooks/web_hook.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index 327cb585ffa..c8fa9c50918 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -48,7 +48,7 @@ class WebHook < ActiveRecord::Base verify: false, basic_auth: auth) end - rescue SocketError, Errno::ECONNREFUSED, Net::OpenTimeout => e + rescue SocketError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout => e logger.error("WebHook Error => #{e}") false end |