diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index e5dbc211d..9d8dbff82 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -109,9 +109,9 @@ class SyncForgeController < ApplicationController def check_sync_project(project,sync_params) begin gitea_main = "https://www.trustie.net/" - # if request.subdomain === 'testforgeplus' - # gitea_main = "https://ucloudtest.trustie.net/" - # end + if request.subdomain === 'testforgeplus' + gitea_main = "https://ucloudtest.trustie.net/" + end SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------") change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score @@ -137,9 +137,9 @@ class SyncForgeController < ApplicationController } gitea_main = "https://www.trustie.net/" - # if request.subdomain === 'testforgeplus' - # gitea_main = "https://ucloudtest.trustie.net/" - # end + if request.subdomain === 'testforgeplus' + gitea_main = "https://ucloudtest.trustie.net/" + end SyncProjectsJob.perform_later(sync_projects_params, gitea_main) SyncLog.sync_log("***8. end_to_sync_new_project---------------") end diff --git a/app/jobs/sync_projects_job.rb b/app/jobs/sync_projects_job.rb index 59ae9566f..a8f4824be 100644 --- a/app/jobs/sync_projects_job.rb +++ b/app/jobs/sync_projects_job.rb @@ -47,10 +47,10 @@ class SyncProjectsJob < ApplicationJob end def create_target(target_jsons, target_type) - begin - SyncLog.sync_log("***【#{target_type}】. begin_to_create_target---------------") - return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank? - target_jsons.each_with_index do |re,index| + SyncLog.sync_log("***【#{target_type}】. begin_to_create_target---------------") + return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank? + target_jsons.each_with_index do |re,index| + begin SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}") if re[:target_params].present? SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}") @@ -85,7 +85,7 @@ class SyncProjectsJob < ApplicationJob new_target = target_type.constantize.new(re[:target_params].merge(user_id: u_id)) end end - + if !is_exists && new_target.save! SyncLog.sync_log("***【#{target_type}】. create_success---------------") if re[:journals].present? @@ -107,11 +107,14 @@ class SyncProjectsJob < ApplicationJob SyncLog.sync_log("***【#{target_type}】. create_failed---or has_exists---------------") end end + SyncLog.sync_log("***111222. end_to_create_target---------------") + rescue => e + SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================") + next end - SyncLog.sync_log("***111222. end_to_create_target---------------") - rescue => e - SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================") + end + end