diff options
author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-11-12 11:48:32 +0000 |
---|---|---|
committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-11-12 11:48:32 +0000 |
commit | bdc4cd0143272f5bfdd88ca127bb4905b6c2864d (patch) | |
tree | bb7d9279b4be3c188bcdc200dc22ae18b4edcec2 /app | |
parent | 97c49a148f29d86b12946616c77855a65a88d426 (diff) | |
download | gitlab-ce-bdc4cd0143272f5bfdd88ca127bb4905b6c2864d.tar.gz |
Make Kubernetes error logs formatted the same as user messages
Diffstat (limited to 'app')
-rw-r--r-- | app/services/clusters/applications/check_installation_progress_service.rb | 4 | ||||
-rw-r--r-- | app/services/clusters/applications/install_service.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb index 2e27cfa20f7..49b8825c3a4 100644 --- a/app/services/clusters/applications/check_installation_progress_service.rb +++ b/app/services/clusters/applications/check_installation_progress_service.rb @@ -15,7 +15,7 @@ module Clusters check_timeout end rescue Kubeclient::HttpError => e - Rails.logger.error "Kubernetes error: #{e.class.name} #{e.message}" + Rails.logger.error("Kubernetes error: #{e.error_code} #{e.message}") app.make_errored!("Kubernetes error: #{e.error_code}") unless app.errored? end @@ -53,7 +53,7 @@ module Clusters def remove_installation_pod helm_api.delete_pod!(install_command.pod_name) rescue => e - Rails.logger.error "Kubernetes error: #{e.class.name} #{e.message}" + Rails.logger.error("Kubernetes error: #{e.class.name} #{e.message}") # no-op end diff --git a/app/services/clusters/applications/install_service.rb b/app/services/clusters/applications/install_service.rb index 0aec01565b6..947d22022bc 100644 --- a/app/services/clusters/applications/install_service.rb +++ b/app/services/clusters/applications/install_service.rb @@ -13,7 +13,7 @@ module Clusters ClusterWaitForAppInstallationWorker.perform_in( ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id) rescue Kubeclient::HttpError => e - Rails.logger.error "Kubernetes error: #{e.class.name} #{e.message}" + Rails.logger.error("Kubernetes error: #{e.error_code} #{e.message}") app.make_errored!("Kubernetes error: #{e.error_code}") rescue StandardError => e Rails.logger.error "Can't start installation process: #{e.class.name} #{e.message}" |