From ebd83982cd261480d028582ac38be6d9d77191fa Mon Sep 17 00:00:00 2001 From: Hana Pearlman Date: Thu, 8 Aug 2019 10:33:46 -0400 Subject: [PATCH] initial audit changes --- lib/mongo/session.rb | 5 ++++- lib/mongo/session/session_pool.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/mongo/session.rb b/lib/mongo/session.rb index d7958b4021..be597704b8 100644 --- a/lib/mongo/session.rb +++ b/lib/mongo/session.rb @@ -299,7 +299,7 @@ def end_session if within_states?(TRANSACTION_IN_PROGRESS_STATE) begin abort_transaction - rescue Mongo::Error + rescue Mongo::Error, Error::AuthError end end @client.cluster.session_pool.checkin(@server_session) @@ -429,6 +429,9 @@ def with_transaction(options=nil) transaction_in_progress = false raise end + rescue Error::AuthError + transaction_in_progress = false + raise end end end diff --git a/lib/mongo/session/session_pool.rb b/lib/mongo/session/session_pool.rb index 3ddedae0b8..dc783e23a1 100644 --- a/lib/mongo/session/session_pool.rb +++ b/lib/mongo/session/session_pool.rb @@ -117,7 +117,7 @@ def end_sessions :selector => {endSessions: @queue.shift(10_000).collect { |s| s.session_id }}, :db_name => Database::ADMIN).execute(server) end - rescue Mongo::Error + rescue Mongo::Error, Error::AuthError end private