diff options
| author | Matt Jankowski <matt@jankowski.online> | 2023-05-02 12:16:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-02 18:16:07 +0200 |
| commit | f1c1dd0118c5d222c5bf48ed8d223fe39ecde39e (patch) | |
| tree | e6de1b5452868bab416500988c6ab1cb2b72040f /app/controllers | |
| parent | a7df578f97679041340d2840a20d335abe9199bf (diff) | |
Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/media_proxy_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/settings/exports_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index 1b5486c1226..8d480d704e2 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -16,7 +16,7 @@ class MediaProxyController < ApplicationController rescue_from HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, with: :internal_server_error def show - with_lock("media_download:#{params[:id]}") do + with_redis_lock("media_download:#{params[:id]}") do @media_attachment = MediaAttachment.remote.attached.find(params[:id]) authorize @media_attachment.status, :show? redownload! if @media_attachment.needs_redownload? && !reject_media? diff --git a/app/controllers/settings/exports_controller.rb b/app/controllers/settings/exports_controller.rb index deaa7940eb7..46a340aeb3d 100644 --- a/app/controllers/settings/exports_controller.rb +++ b/app/controllers/settings/exports_controller.rb @@ -15,7 +15,7 @@ class Settings::ExportsController < Settings::BaseController def create backup = nil - with_lock("backup:#{current_user.id}") do + with_redis_lock("backup:#{current_user.id}") do authorize :backup, :create? backup = current_user.backups.create! end |