diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-22 21:08:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-22 21:08:56 +0300 |
commit | c25c2a508b3322278c6528685c2af703b29ba170 (patch) | |
tree | fe7aba0d3633225baa308cb647c9cc7b4b455e3a /app/services/web_hooks | |
parent | 632d0734750382e7c4e5f1b3c526a94acf6e7ce2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/web_hooks')
-rw-r--r-- | app/services/web_hooks/log_execution_service.rb | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/app/services/web_hooks/log_execution_service.rb b/app/services/web_hooks/log_execution_service.rb index 17dcf615830..5be8aee3ae8 100644 --- a/app/services/web_hooks/log_execution_service.rb +++ b/app/services/web_hooks/log_execution_service.rb @@ -14,7 +14,6 @@ module WebHooks @hook = hook @log_data = log_data.transform_keys(&:to_sym) @response_category = response_category - @prev_state = hook.active_state(ignore_flag: true) end def execute @@ -43,36 +42,12 @@ module WebHooks hook.failed! end - log_state_change hook.update_last_failure end rescue Gitlab::ExclusiveLeaseHelpers::FailedToObtainLockError raise if raise_lock_error? end - def log_state_change - new_state = hook.active_state(ignore_flag: true) - - return if @prev_state == new_state - - Gitlab::AuthLogger.info( - message: 'WebHook change active_state', - # identification - hook_id: hook.id, - hook_type: hook.type, - project_id: hook.project_id, - group_id: hook.group_id, - # relevant data - prev_state: @prev_state, - new_state: new_state, - duration: log_data[:execution_duration], - response_status: log_data[:response_status], - recent_hook_failures: hook.recent_failures, - # context - **Gitlab::ApplicationContext.current - ) - end - def lock_name "web_hooks:update_hook_failure_state:#{hook.id}" end |