Merge pull request #12 from avvo/broberts/fix-timeout

Broberts/fix timeout
avvo · May 29, 2017 · 30debac · 30debac
2 parents d64d4cf + 41872a6
commit 30debac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/delsolr.gemspec b/delsolr.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "delsolr"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
   s.authors = ["Ben VandenBos"]
   s.date = %q{2009-11-02}
   s.description = "Ruby wrapper for Lucene Solr"

diff --git a/lib/delsolr/client.rb b/lib/delsolr/client.rb
@@ -153,7 +153,9 @@ def query(request_handler, opts = {})
 
       if body.blank? # cache miss (or wasn't enabled)
         response = begin
-          connection.post("#{configuration.path}/select", query_builder.request_string)
+          connection.post("#{configuration.path}/select", query_builder.request_string) do | req |
+            req.options.timeout = configuration.timeout
+          end
         rescue Faraday::ClientError => e
           raise ConnectionError, e.message
         end
@@ -268,7 +270,6 @@ def pending_documents
     def connection_block
       @connection_block ||= lambda do |faraday|
         faraday.adapter Faraday.default_adapter
-        faraday.options[:timeout] = configuration.timeout
       end
     end