diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-28 15:06:15 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-28 15:06:15 +0000 |
| commit | ad6487cec8cf92f4484013014cda921606970a56 (patch) | |
| tree | 6c25706fb9409a7f4a35550e9150449b8b845f01 | |
| parent | 44167f5c2c104a6881618579664559a72a277364 (diff) | |
| parent | a94e91a45b8fb861060a901b5bcfa218d597a208 (diff) | |
| download | gitlab-ce-ad6487cec8cf92f4484013014cda921606970a56.tar.gz | |
Merge branch 'log_webhook_timeout' into 'master'
Log web hook execution timeout events
See merge request !13134
| -rw-r--r-- | app/services/web_hook_service.rb | 2 | ||||
| -rw-r--r-- | spec/services/web_hook_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/web_hook_service.rb b/app/services/web_hook_service.rb index a5110a23cad..27c3ba197ac 100644 --- a/app/services/web_hook_service.rb +++ b/app/services/web_hook_service.rb @@ -44,7 +44,7 @@ class WebHookService http_status: response.code, message: response.to_s } - rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout => e + rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout => e log_execution( trigger: hook_name, url: hook.url, diff --git a/spec/services/web_hook_service_spec.rb b/spec/services/web_hook_service_spec.rb index a5de86a0835..e79c12daa1c 100644 --- a/spec/services/web_hook_service_spec.rb +++ b/spec/services/web_hook_service_spec.rb @@ -53,7 +53,7 @@ describe WebHookService do end it 'handles exceptions' do - exceptions = [SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout] + exceptions = [SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout] exceptions.each do |exception_class| exception = exception_class.new('Exception message') |