summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-29 16:41:10 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-29 16:41:10 +0200
commitb07802ab684d2126f84f927a21191a79d200788d (patch)
treec729b705ce585b828b0838d29b86e8665cb9a387
parent75043a9eba557d1fe31d81dc30bd979af321e907 (diff)
downloadgitlab-ce-b07802ab684d2126f84f927a21191a79d200788d.tar.gz
Rescue Net::OpenTimeout exception in web hook
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/models/hooks/web_hook.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index 8479d4aecf6..d1d522be194 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 => e
+ rescue SocketError, Errno::ECONNREFUSED, Net::OpenTimeout => e
logger.error("WebHook Error => #{e}")
false
end