From 35fc41fb9ff84c7d7d883651a7b722e0087d3e3b Mon Sep 17 00:00:00 2001 From: Frederic Merizen Date: Fri, 7 Dec 2018 16:59:25 +0100 Subject: [PATCH] Really fix #3133 --- lib/active_storage/service/cellar_service.rb | 2 +- lib/cellar/cellar_adapter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/active_storage/service/cellar_service.rb b/lib/active_storage/service/cellar_service.rb index f704fcf49..43f2d0632 100644 --- a/lib/active_storage/service/cellar_service.rb +++ b/lib/active_storage/service/cellar_service.rb @@ -4,7 +4,7 @@ module ActiveStorage @adapter = Cellar::CellarAdapter.new(access_key_id, secret_access_key, bucket) end - def upload(key, io, checksum: nil) + def upload(key, io, checksum: nil, **) instrument :upload, key: key, checksum: checksum do @adapter.session { |s| s.upload(key, io, checksum) } end diff --git a/lib/cellar/cellar_adapter.rb b/lib/cellar/cellar_adapter.rb index 97369c2c5..1a1ed400c 100644 --- a/lib/cellar/cellar_adapter.rb +++ b/lib/cellar/cellar_adapter.rb @@ -34,7 +34,7 @@ module Cellar @signer = signer end - def upload(key, io, checksum: nil, **) + def upload(key, io, checksum) with_io_length(io) do |io, length| request = Net::HTTP::Put.new("/#{key}") request.content_type = 'application/octet-stream'