Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/mongo/auth/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def dispatch_msg(connection, conversation, msg)
else
nil
end
result = Operation::Result.new(reply, connection.description, connection_global_id)
result = Operation::Result.new(reply, connection.description, connection_global_id, context: context)
connection.update_cluster_time(result)
reply_document
end
Expand Down
2 changes: 1 addition & 1 deletion lib/mongo/collection/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module Helpers
# @return [ Result ] The result of the execution.
def do_drop(operation, session, context)
operation.execute(next_primary(nil, session), context: context)
rescue Error::OperationFailure => ex
rescue Error::OperationFailure::Family => ex
# NamespaceNotFound
if ex.code == 26 || ex.code.nil? && ex.message =~ /ns not found/
false
Expand Down
2 changes: 1 addition & 1 deletion lib/mongo/collection/view/change_stream.rb
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def close
unless closed?
begin
@cursor.close
rescue Error::OperationFailure, Error::SocketError, Error::SocketTimeoutError, Error::MissingConnection
rescue Error::OperationFailure::Family, Error::SocketError, Error::SocketTimeoutError, Error::MissingConnection
# ignore
end
@cursor = nil
Expand Down
2 changes: 1 addition & 1 deletion lib/mongo/collection/view/iterable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def each
#
# @return [ nil ] Always nil.
#
# @raise [ Error::OperationFailure ] If the server cursor close fails.
# @raise [ Error::OperationFailure::Family ] If the server cursor close fails.
#
# @since 2.1.0
def close_query
Expand Down
2 changes: 1 addition & 1 deletion lib/mongo/collection/view/readable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ def estimated_document_count(opts = {})
result.n.to_i
end
end
rescue Error::OperationFailure => exc
rescue Error::OperationFailure::Family => exc
if exc.code == 26
# NamespaceNotFound
# This should only happen with the aggregation pipeline path
Expand Down
2 changes: 1 addition & 1 deletion lib/mongo/cursor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ def close
end

nil
rescue Error::OperationFailure, Error::SocketError, Error::SocketTimeoutError, Error::ServerNotUsable
rescue Error::OperationFailure::Family, Error::SocketError, Error::SocketTimeoutError, Error::ServerNotUsable
# Errors are swallowed since there is noting can be done by handling them.
ensure
end_session
Expand Down
1 change: 1 addition & 0 deletions lib/mongo/error.rb
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ def write_concern_error_labels
require 'mongo/error/server_api_conflict'
require 'mongo/error/server_api_not_supported'
require 'mongo/error/server_not_usable'
require 'mongo/error/server_timeout_error'
require 'mongo/error/transactions_not_supported'
require 'mongo/error/timeout_error'
require 'mongo/error/unknown_payload_type'
Expand Down
Loading