diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-07 08:56:05 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-07 08:56:05 +0000 |
| commit | 3c89a788c795fba2b050a0af0d8261e302d8cded (patch) | |
| tree | d90f1e314fe446d0f4a7ee86c2e4bd55a1fc7b07 | |
| parent | ecfbb96384b2712aaf6c03dd04a3236b0578e18d (diff) | |
| parent | 91a183bc57e0fccd12d08e861bd8a37b402d81f3 (diff) | |
| download | gitlab-ce-3c89a788c795fba2b050a0af0d8261e302d8cded.tar.gz | |
Merge branch 'fix/import-export-log' into 'master'
Fix log statements in import/export
Fixes - as seen in the logs:
```
Import/Export error raised on /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/import_export/file_importer.rb:19:in `rescue in import': undefined method `message' for #<String:0x007fc45e977e10>
```
See merge request !5129
| -rw-r--r-- | lib/gitlab/import_export/command_line_util.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/saver.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/command_line_util.rb b/lib/gitlab/import_export/command_line_util.rb index 62c736451b7..2249904145c 100644 --- a/lib/gitlab/import_export/command_line_util.rb +++ b/lib/gitlab/import_export/command_line_util.rb @@ -29,7 +29,7 @@ module Gitlab def execute(cmd) output, status = Gitlab::Popen.popen(cmd) - @shared.error(output.to_s) unless status.zero? + @shared.error(Gitlab::ImportExport::Error.new(output.to_s)) unless status.zero? status.zero? end diff --git a/lib/gitlab/import_export/saver.rb b/lib/gitlab/import_export/saver.rb index dd4fdf37309..6a60b65071f 100644 --- a/lib/gitlab/import_export/saver.rb +++ b/lib/gitlab/import_export/saver.rb @@ -17,7 +17,7 @@ module Gitlab Rails.logger.info("Saved project export #{archive_file}") archive_file else - @shared.error("Unable to save #{archive_file} into #{@shared.export_path}") + @shared.error(Gitlab::ImportExport::Error.new("Unable to save #{archive_file} into #{@shared.export_path}")) false end rescue => e |