FIX jobs
This commit is contained in:
parent
d1089a4a4b
commit
5c7c235ed9
|
@ -112,7 +112,7 @@ class RepositoriesController < ApplicationController
|
||||||
|
|
||||||
def sync_mirror
|
def sync_mirror
|
||||||
@repo&.mirror.set_status!(Mirror.statuses[:waiting])
|
@repo&.mirror.set_status!(Mirror.statuses[:waiting])
|
||||||
SyncMirroredRepositoryJob.perform_later(@repo, current_user)
|
SyncMirroredRepositoryJob.perform_later(@repo.id, current_user.id)
|
||||||
render_ok
|
render_ok
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
class MigrateRemoteRepositoryJob < ApplicationJob
|
class MigrateRemoteRepositoryJob < ApplicationJob
|
||||||
queue_as :default
|
queue_as :default
|
||||||
|
|
||||||
def perform(repo, token, params)
|
def perform(repo_id, token, params)
|
||||||
|
repo = Repository.find_by(id: repo_id)
|
||||||
|
return if repo.blank?
|
||||||
|
|
||||||
gitea_repository = Gitea::Repository::MigrateService.new(token, params).call
|
gitea_repository = Gitea::Repository::MigrateService.new(token, params).call
|
||||||
sync_project(repo, gitea_repository)
|
sync_project(repo, gitea_repository)
|
||||||
sync_repository(repo, gitea_repository)
|
sync_repository(repo, gitea_repository)
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
class SyncMirroredRepositoryJob < ApplicationJob
|
class SyncMirroredRepositoryJob < ApplicationJob
|
||||||
queue_as :default
|
queue_as :default
|
||||||
|
|
||||||
def perform(repo, current_user)
|
def perform(repo_id, user_id)
|
||||||
|
repo = Repository.find_by(id: repo_id)
|
||||||
|
current_user = User.find_by(id: user_id)
|
||||||
|
return if repo.blank? || current_user.blank?
|
||||||
result = Gitea::Repository::SyncMirroredService.new(repo.user.login, repo.identifier, token: current_user.gitea_token).call
|
result = Gitea::Repository::SyncMirroredService.new(repo.user.login, repo.identifier, token: current_user.gitea_token).call
|
||||||
repo&.mirror.set_status! if result[:status] === 200
|
repo&.mirror.set_status! if result[:status] === 200
|
||||||
end
|
end
|
||||||
|
|
|
@ -12,7 +12,7 @@ class Repositories::MigrateService < ApplicationService
|
||||||
ActiveRecord::Base.transaction do
|
ActiveRecord::Base.transaction do
|
||||||
if @repository.save!
|
if @repository.save!
|
||||||
@repository.set_mirror! if wrapper_mirror
|
@repository.set_mirror! if wrapper_mirror
|
||||||
MigrateRemoteRepositoryJob.perform_later(@repository, user.gitea_token, gitea_repository_params)
|
MigrateRemoteRepositoryJob.perform_later(@repository.id, user.gitea_token, gitea_repository_params)
|
||||||
end
|
end
|
||||||
@repository
|
@repository
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue