diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 21:08:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 21:08:12 +0300 |
| commit | 41c9fff024a72e6581e71c2ae080bdcb961a5601 (patch) | |
| tree | b36a268efbaee403fa424048f030d5e281dcfbf8 /config/initializers | |
| parent | fb73ca3398c2ac49a616ab553e117b0586089702 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/0_runtime_identify.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/initializers/0_runtime_identify.rb b/config/initializers/0_runtime_identify.rb index 21abd637417..e6be19ffb79 100644 --- a/config/initializers/0_runtime_identify.rb +++ b/config/initializers/0_runtime_identify.rb @@ -1,9 +1,8 @@ # frozen_string_literal: true begin - current_runtime = Gitlab::Runtime.identify - Gitlab::AppLogger.info("Process #{Process.pid} (#{$0}) identified as: #{current_runtime}") -rescue => e + Gitlab::Runtime.identify +rescue Gitlab::Runtime::IdentificationError => e message = <<-NOTICE \n!! RUNTIME IDENTIFICATION FAILED: #{e} Runtime based configuration settings may not work properly. |