Verified Commit 99155c17 authored by Bob Van Landuyt's avatar Bob Van Landuyt 💬 Committed by GitLab
Browse files

Merge branch 'mw/inline-nit' into 'master' 

refactor(rate_limit): inline single-use eval_incr_script helper

See merge request !295

Merged-by: Bob Van Landuyt's avatarBob Van Landuyt <bob@gitlab.com>
Approved-by: Bob Van Landuyt's avatarBob Van Landuyt <bob@gitlab.com>
Co-authored-by: Max Woolf's avatarMax Woolf <mwoolf@gitlab.com>
parents a0ab7b16 e4a6c5c8

lib/labkit/rate_limit/evaluator.rb

+1 −5
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ module Labkit 
      # otherwise.

      def incr_with_ttl(redis_key, period, cost)

        @redis.with do |conn|

          raw_count, ttl = eval_incr_script(conn, redis_key, period, cost)

          raw_count, ttl = INCR_SCRIPT.eval(conn, keys: [redis_key], argv: [period, cost])

          [Float(raw_count), ttl]

        end

      end
@@ -191,10 +191,6 @@ module Labkit 
        end

      end



      def eval_incr_script(conn, redis_key, period, cost)

        INCR_SCRIPT.eval(conn, keys: [redis_key], argv: [period, cost])

      end



      def log_error(error, identifier)

        @logger.warn(

          message: "rate_limit_error",