Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-07-11 01:08:54 +0300
committerStan Hu <stanhu@gmail.com>2018-07-11 01:11:10 +0300
commit0c1eebe24c9717da10c6335b91273dbb73061ff8 (patch)
tree8e2b1239a9212f9151f47c7bb27c3fa1e6e5bc70 /app/workers
parent255db3d59792e9bac92f4327b4e324e2bd32810a (diff)
Fix ArgumentError in GitGarbageCollectWorker Sidekiq job
When the Gitaly call failed, the exception handling failed because `method` is expected to have a parameter. Closes #49096
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/git_garbage_collect_worker.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/git_garbage_collect_worker.rb b/app/workers/git_garbage_collect_worker.rb
index fd49bc18161..2d381c6fd6c 100644
--- a/app/workers/git_garbage_collect_worker.rb
+++ b/app/workers/git_garbage_collect_worker.rb
@@ -65,10 +65,10 @@ class GitGarbageCollectWorker
client.repack_incremental
end
rescue GRPC::NotFound => e
- Gitlab::GitLogger.error("#{method} failed:\nRepository not found")
+ Gitlab::GitLogger.error("#{__method__} failed:\nRepository not found")
raise Gitlab::Git::Repository::NoRepository.new(e)
rescue GRPC::BadStatus => e
- Gitlab::GitLogger.error("#{method} failed:\n#{e}")
+ Gitlab::GitLogger.error("#{__method__} failed:\n#{e}")
raise Gitlab::Git::CommandError.new(e)
end