From 3586f6cf20a782e0d214bc47b08a75cee2cdeae1 Mon Sep 17 00:00:00 2001 From: jasder duan Date: Thu, 16 Nov 2023 19:47:02 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ci/cloud_accounts_controller.rb | 4 ++-- app/controllers/ci/projects_controller.rb | 4 ++-- app/controllers/concerns/ci/cloud_account_manageable.rb | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/ci/cloud_accounts_controller.rb b/app/controllers/ci/cloud_accounts_controller.rb index 36fb1db03..7cc5a80d6 100644 --- a/app/controllers/ci/cloud_accounts_controller.rb +++ b/app/controllers/ci/cloud_accounts_controller.rb @@ -45,10 +45,10 @@ class Ci::CloudAccountsController < Ci::BaseController end result = bind_hook!(current_user, @cloud_account, @repo) -Rail.logger.info "########## result: #{result}" +Rails.logger.info "########## result: #{result}" @project.update_columns(open_devops: true, gitea_webhook_id: result['id']) @cloud_account.update_column(:ci_user_id, @ci_user.user_id) -Rail.logger.info "########## @cloud_account: #{@cloud_account.to_json} --- @repo: #{@repo.to_json} --- @project: #{@project}" +Rails.logger.info "########## @cloud_account: #{@cloud_account.to_json} --- @repo: #{@repo.to_json} --- @project: #{@project}" end render_ok rescue Exception => ex diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb index ce37df325..6c842bc60 100644 --- a/app/controllers/ci/projects_controller.rb +++ b/app/controllers/ci/projects_controller.rb @@ -49,11 +49,11 @@ class Ci::ProjectsController < Ci::BaseController end result = bind_hook!(current_user, @cloud_account, @repo) - Rail.logger.info "########## result: #{result}" + Rails.logger.info "########## result: #{result}" @project.update_columns(open_devops: true, gitea_webhook_id: result['id']) @project.increment!(:open_devops_count) @cloud_account.update_column(:ci_user_id, @ci_user.user_id) - Rail.logger.info "########## @cloud_account: #{@cloud_account.to_json} --- @repo: #{@repo.to_json} --- @project: #{@project}" + Rails.logger.info "########## @cloud_account: #{@cloud_account.to_json} --- @repo: #{@repo.to_json} --- @project: #{@project}" end render_ok rescue Exception => ex diff --git a/app/controllers/concerns/ci/cloud_account_manageable.rb b/app/controllers/concerns/ci/cloud_account_manageable.rb index 13edb09c6..95c5c9789 100644 --- a/app/controllers/concerns/ci/cloud_account_manageable.rb +++ b/app/controllers/concerns/ci/cloud_account_manageable.rb @@ -116,6 +116,9 @@ module Ci::CloudAccountManageable }, type: "gitea" } + + Rails.logger.info "============> hook_params: #{hook_params}" + Rails.logger.info "============> user.gitea_token: #{user.gitea_token}" result = Gitea::Hooks::CreateService.call(user.gitea_token, user.login, repo.repo_name, hook_params) result[:status].present? ? nil : result