Skip to content
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

Jump to bottom

DEPRECATION: Rsolr.new/connect option 'read_timeout' is deprecated an… #1017

Merged
merged 2 commits into from
Jun 4, 2024
Merged

DEPRECATION: Rsolr.new/connect option 'read_timeout' is deprecated an… #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4de2112
DEPRECATION: Rsolr.new/connect option 'read_timeout' is deprecated an…
rocket-turtle Jul 8, 2022
4f60935
Merge branch 'master' into patch-rsolr-deprecation
serggl Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion sunspot/lib/sunspot/session.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def batch
def connection
@connection ||= self.class.connection_class.connect(
url: config.solr.url,
read_timeout: config.solr.read_timeout,
timeout: config.solr.read_timeout,
open_timeout: config.solr.open_timeout,
proxy: config.solr.proxy,
update_format: update_format
Expand Down
2 changes: 1 addition & 1 deletion sunspot/spec/api/session_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
it 'should open a connection with custom read timeout' do
Sunspot.config.solr.read_timeout = 0.5
Sunspot.commit
expect(connection.opts[:read_timeout]).to eq(0.5)
expect(connection.opts[:timeout]).to eq(0.5)
end

it 'should open a connection with custom open timeout' do
Expand Down