3d3af85f-d15e-4a16-9ec1-f834b564ac67

Committed 01 Jul 2025 05:48PM UTC coverage: 97.424%. Remained the same

Build # 3d3af85f-d15e-4a16-9ec1-f834b564ac67

Build Type

push

circleci

Committed by

mark-dce

Commit Message

Fix redlock deprecation warnings

**ISSUE**
After the `Redis.current` fix, we are now seeing significant numbers
of deprecations warnings like:
```
Passing 'call' command to redis as is; blind passthrough has been
  deprecated and will be removed in redis-namespace 2.0
  (at /Users/mark/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/
   redlock-2.0.6/lib/redlock/client.rb:214:in `block (2 levels) in unlock')
```

**DIAGNOSIS**
We were passing a RedisNamespace object to Redlock instead of a
plain Redis connection specifier. RedisNamespace was complaining
any time an admin (not-namespace-able) command was received.

**RESOLUTION**
Pass a Redis URI to RedLock instead of a RedisNamespace object.

Run Details

2 of 2 new or added lines in 1 file covered. (100.0%)

286 existing lines in 34 files now uncovered.

2837 of 2912 relevant lines covered (97.42%)

52.12 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

91.3

/app/controllers/application_controller.rb

class ApplicationController < ActionController::Base
  helper Openseadragon::OpenseadragonHelper
  # Adds a few additional behaviors into the application controller
  include Blacklight::Controller
  skip_after_action :discard_flash_if_xhr
  include Hydra::Controller::ControllerBehavior

  # Adds Hyrax behaviors into the application controller
  include Hyrax::Controller
  include Hyrax::ThemedLayoutController
  include HttpAuthConcern

  # Check to see if we're in read_only mode
  before_action :check_read_only, except: [:show, :index]

  with_themed_layout '1_column'

  protect_from_forgery with: :exception

  # What to do if read_only mode has been enabled, via FlipFlop
  # If read_only is enabled, redirect any requests that would allow
  # changes to the system. This is to enable easier migrations.
  def check_read_only
    return unless Flipflop.read_only?
    # Exempt the FlipFlop controller itself from read_only mode, so it can be turned off
    return if self.class.to_s == Hyrax::Admin::StrategiesController.to_s
    redirect_back(
      fallback_location: root_path,
      alert: "This system is in read-only mode for maintenance. No submissions or edits can be made at this time."
    )
  end

  # Override from Hyrax
  # Provide a place for Devise to send the user to after signing in
  # Send newly signed in users to the main screen
  def user_root_path
    root_path
  end

  rescue_from ActionController::RoutingError do |exception|
    render plain: '404 Not found', status: 404
  end

  private

  def append_info_to_payload(payload)
    super
    payload[:request_id] = request.request_id
  end
end

1	class ApplicationController < ActionController::Base	4✔
2	helper Openseadragon::OpenseadragonHelper	4✔
3	# Adds a few additional behaviors into the application controller
4	include Blacklight::Controller	4✔
5	skip_after_action :discard_flash_if_xhr	4✔
6	include Hydra::Controller::ControllerBehavior	4✔
7
8	# Adds Hyrax behaviors into the application controller
9	include Hyrax::Controller	4✔
10	include Hyrax::ThemedLayoutController	4✔
11	include HttpAuthConcern	4✔
12
13	# Check to see if we're in read_only mode
14	before_action :check_read_only, except: [:show, :index]	4✔
15
16	with_themed_layout '1_column'	4✔
17
18	protect_from_forgery with: :exception	4✔
19
20	# What to do if read_only mode has been enabled, via FlipFlop
21	# If read_only is enabled, redirect any requests that would allow
22	# changes to the system. This is to enable easier migrations.
23	def check_read_only	4✔
24	return unless Flipflop.read_only?	80✔
25	# Exempt the FlipFlop controller itself from read_only mode, so it can be turned off
UNCOV 26	return if self.class.to_s == Hyrax::Admin::StrategiesController.to_s	2✔
UNCOV 27	redirect_back(	2✔
28	fallback_location: root_path,
29	alert: "This system is in read-only mode for maintenance. No submissions or edits can be made at this time."
30	)
31	end
32
33	# Override from Hyrax
34	# Provide a place for Devise to send the user to after signing in
35	# Send newly signed in users to the main screen
36	def user_root_path	4✔
37	root_path	×
38	end
39
40	rescue_from ActionController::RoutingError do \|exception\|	4✔
41	render plain: '404 Not found', status: 404	×
42	end
43
44	private	4✔
45
46	def append_info_to_payload(payload)	4✔
47	super	238✔
48	payload[:request_id] = request.request_id	238✔
49	end
50	end

curationexperts / laevigata / 3d3af85f-d15e-4a16-9ec1-f834b564ac67

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous