diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-03 22:45:35 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-03 22:45:35 +0000 |
| commit | 5f7e671fdcb53eb45bc709356906a64ea1f9e467 (patch) | |
| tree | 8ba6ac3130f3f13c30cd33183981b98d1b59ca46 | |
| parent | d9aca741155f456711e37ea68a28a46d349af698 (diff) | |
| parent | b700a84e4069b099d98db11d91a36e3762467e29 (diff) | |
| download | gitlab-ce-5f7e671fdcb53eb45bc709356906a64ea1f9e467.tar.gz | |
Merge branch 'pages-debug-log' into 'master'
Log errors in UpdatePagesService
See merge request !10335
| -rw-r--r-- | app/services/base_service.rb | 4 | ||||
| -rw-r--r-- | app/services/projects/update_pages_service.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/pages-debug-log.yml | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/app/services/base_service.rb b/app/services/base_service.rb index 745c2c4b681..a0cb00dba58 100644 --- a/app/services/base_service.rb +++ b/app/services/base_service.rb @@ -24,6 +24,10 @@ class BaseService Gitlab::AppLogger.info message end + def log_error(message) + Gitlab::AppLogger.error message + end + def system_hook_service SystemHooksService.new end diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb index 523b9f41916..17cf71cf098 100644 --- a/app/services/projects/update_pages_service.rb +++ b/app/services/projects/update_pages_service.rb @@ -46,6 +46,7 @@ module Projects end def error(message, http_status = nil) + log_error("Projects::UpdatePagesService: #{message}") @status.allow_failure = !latest? @status.description = message @status.drop diff --git a/changelogs/unreleased/pages-debug-log.yml b/changelogs/unreleased/pages-debug-log.yml new file mode 100644 index 00000000000..328c8e4615b --- /dev/null +++ b/changelogs/unreleased/pages-debug-log.yml @@ -0,0 +1,4 @@ +--- +title: Log errors during generating of Gitlab Pages to debug log +merge_request: 10335 +author: Danilo Bargen |