diff options
| author | James Lopez <james@jameslopez.es> | 2017-03-24 12:08:34 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-04-05 16:11:51 +0200 |
| commit | 58371efbb0bd051d3a82f82acac98ad4692efeb4 (patch) | |
| tree | 226bfb1a920a6344d6efb3b0357473412aa9dade /app/workers/repository_import_worker.rb | |
| parent | 7196adaaa4ce5aa259d285dbca6aa98f4deb046b (diff) | |
| download | gitlab-ce-58371efbb0bd051d3a82f82acac98ad4692efeb4.tar.gz | |
Periodically mark projects that are stuck in importing as failed
Adds import jid to projects
Refactor middleware to set custom expiration time via sidekiq options
Add completed_jids option to sidekiq status and a few other changes
Diffstat (limited to 'app/workers/repository_import_worker.rb')
| -rw-r--r-- | app/workers/repository_import_worker.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 68a6fd76e70..b33ba2ed7c1 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -2,6 +2,8 @@ class RepositoryImportWorker include Sidekiq::Worker include DedicatedSidekiqQueue + sidekiq_options status_expiration: StuckImportJobsWorker::IMPORT_EXPIRATION + attr_accessor :project, :current_user def perform(project_id) @@ -12,7 +14,7 @@ class RepositoryImportWorker import_url: @project.import_url, path: @project.path_with_namespace) - project.update_column(:import_error, nil) + project.update_columns(import_jid: self.jid, import_error: nil) result = Projects::ImportService.new(project, current_user).execute |