From 1f5e21bcbce41a5d49998df9ee58c1c875626fd6 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Thu, 31 Jan 2019 10:12:12 +0900 Subject: [PATCH] Remove redundant begin block We enabled `Style/RedundantBegin` cop at #34764, but it is hard to detect an offence if returning value put after the block. --- .../middleware/database_selector/resolver.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/activerecord/lib/active_record/middleware/database_selector/resolver.rb b/activerecord/lib/active_record/middleware/database_selector/resolver.rb index 930ddf900e..27050c9f2d 100644 --- a/activerecord/lib/active_record/middleware/database_selector/resolver.rb +++ b/activerecord/lib/active_record/middleware/database_selector/resolver.rb @@ -64,12 +64,9 @@ def read_from_replica(&blk) def write_to_primary(&blk) ActiveRecord::Base.connected_to(role: :writing) do instrumenter.instrument("database_selector.active_record.wrote_to_primary") do - begin - ret = yield - ensure - resolver.update_last_write_timestamp - end - ret + yield + ensure + resolver.update_last_write_timestamp end end end -- GitLab