diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /lib/grafana | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'lib/grafana')
| -rw-r--r-- | lib/grafana/client.rb | 2 | ||||
| -rw-r--r-- | lib/grafana/time_window.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/grafana/client.rb b/lib/grafana/client.rb index 7c0e56b61c8..44808f8bb5a 100644 --- a/lib/grafana/client.rb +++ b/lib/grafana/client.rb @@ -62,7 +62,7 @@ module Grafana raise_error 'Grafana returned invalid SSL data' rescue Errno::ECONNREFUSED raise_error 'Connection refused' - rescue => e + rescue StandardError => e raise_error "Grafana request failed due to #{e.class}" end diff --git a/lib/grafana/time_window.rb b/lib/grafana/time_window.rb index 111e3ab7de2..6cc757d77c5 100644 --- a/lib/grafana/time_window.rb +++ b/lib/grafana/time_window.rb @@ -109,7 +109,7 @@ module Grafana def from_ms_since_epoch(time) return if time.nil? - raise Error.new('Expected milliseconds since epoch') unless ms_since_epoch?(time) + raise Error, 'Expected milliseconds since epoch' unless ms_since_epoch?(time) new(cast_ms_to_time(time)) end |