summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-05 18:12:24 +0200
committerJames Lopez <james@jameslopez.es>2016-05-05 18:12:24 +0200
commit9f5dd2de4e85eba70cd469b36db1c19988c3603f (patch)
treed69713c49f95132501631c578bd967713aa8a680 /app/workers
parent9c60eca87fe30d34e29d26d667a9235912dcbe7e (diff)
downloadgitlab-ce-9f5dd2de4e85eba70cd469b36db1c19988c3603f.tar.gz
handling errors a bit better on import failure
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/project_import_worker.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/app/workers/project_import_worker.rb b/app/workers/project_import_worker.rb
index aaa59f79d7f..cc75da704f6 100644
--- a/app/workers/project_import_worker.rb
+++ b/app/workers/project_import_worker.rb
@@ -11,15 +11,15 @@ class ProjectImportWorker
owner: current_user,
namespace_id: namespace_id,
project_path: path)
+ if project
+ project.repository.after_import
+ project.import_finish
+ else
+ logger.error("There was an error during the import: #{tmpfile}")
+ end
+ end
- # TODO: Move this to import service
- # if result[:status] == :error
- # project.update(import_error: result[:message])
- # project.import_fail
- # return
- # end
-
- project.repository.after_import
- project.import_finish
+ def logger
+ Sidekiq.logger
end
end