diff options
author | Stan Hu <stanhu@gmail.com> | 2018-10-10 16:22:54 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-10-10 16:22:54 +0300 |
commit | 73f5746bb29b7825839daebc1d76e29251a6cfa3 (patch) | |
tree | 6d1bc57715da2ab2ed2c2776444c22d98f0dd017 | |
parent | 31ef05bbdb4fddf5f83d4fe5258bdcc5cf484b9a (diff) |
Only define RUGGED_KEY in one place
-rw-r--r-- | ruby/lib/gitaly_server/rugged_interceptor.rb | 6 | ||||
-rw-r--r-- | ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ruby/lib/gitaly_server/rugged_interceptor.rb b/ruby/lib/gitaly_server/rugged_interceptor.rb index 574d4ccb9..72af71f11 100644 --- a/ruby/lib/gitaly_server/rugged_interceptor.rb +++ b/ruby/lib/gitaly_server/rugged_interceptor.rb @@ -4,8 +4,6 @@ require 'grpc' module GitalyServer class RuggedInterceptor < GRPC::ServerInterceptor - RUGGED_KEY = :rugged_list - # Intercept a unary request response call %i[request_response server_streamer client_streamer bidi_streamer].each do |meth| define_method(meth) do |**, &blk| @@ -18,11 +16,11 @@ module GitalyServer end def init_rugged_reference_list - Thread.current[RUGGED_KEY] = [] + Thread.current[::Gitlab::Git::Repository::RUGGED_KEY] = [] end def cleanup_rugged_references - repos = Thread.current[RUGGED_KEY] + repos = Thread.current[::Gitlab::Git::Repository::RUGGED_KEY] repos.compact.map(&:close) end end diff --git a/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb b/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb index 0d1cb9eaf..61533fac8 100644 --- a/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb +++ b/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb @@ -25,7 +25,7 @@ describe GitalyServer::RuggedInterceptor do let(:streamer) do described_class.new.server_streamer(call: call, method: meth) do - Thread.current[GitalyServer::RuggedInterceptor::RUGGED_KEY] = [rugged] + Thread.current[Gitlab::Git::Repository::RUGGED_KEY] = [rugged] end end |