Skip to content

RUBY-1887 Audit the entire driver for rescues of Mongo::Error and, if appropriate, also rescue AuthError #1483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2019
Merged

RUBY-1887 Audit the entire driver for rescues of Mongo::Error and, if appropriate, also rescue AuthError #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/mongo/session.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/mongo/session/session_pool.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down