[#168] open_timeout and read_timeout are commented out in generated c…

…onfig files
sunspot · Jan 28, 2012 · 437f293 · 437f293
1 parent 7f9252d
commit 437f293
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/sunspot/lib/sunspot/session.rb b/sunspot/lib/sunspot/session.rb
@@ -238,9 +238,10 @@ def batch
     # RSolr::Connection::Base:: The connection for this session
     #
     def connection
-      args = 
       @connection ||=
-        self.class.connection_class.connect(:url => config.solr.url, :read_timeout=>config.solr.read_timeout, :open_timeout=>config.solr.open_timeout)
+        self.class.connection_class.connect(:url          => config.solr.url,
+                                            :read_timeout => config.solr.read_timeout,
+                                            :open_timeout => config.solr.open_timeout)
     end
 
     def indexer

diff --git a/sunspot/spec/api/session_spec.rb b/sunspot/spec/api/session_spec.rb
@@ -85,11 +85,13 @@
       Sunspot.commit
       connection.opts[:url].should == 'http://127.0.0.1:8981/solr'
     end
+
     it 'should open a connection with custom read timeout' do
       Sunspot.config.solr.read_timeout = 0.5
       Sunspot.commit
       connection.opts[:read_timeout].should == 0.5
     end
+
     it 'should open a connection with custom open timeout' do
       Sunspot.config.solr.open_timeout = 0.5
       Sunspot.commit

diff --git a/sunspot_rails/generators/sunspot/templates/sunspot.yml b/sunspot_rails/generators/sunspot/templates/sunspot.yml
@@ -3,8 +3,8 @@ production:
     hostname: localhost
     port: 8983
     log_level: WARNING
-    read_timeout: 2
-    open_timeout: 0.5
+    # read_timeout: 2
+    # open_timeout: 0.5
 
 development:
   solr:
@@ -17,4 +17,4 @@ test:
     hostname: localhost
     port: 8981
     log_level: WARNING
-
+
diff --git a/sunspot_rails/lib/generators/sunspot_rails/install/templates/config/sunspot.yml b/sunspot_rails/lib/generators/sunspot_rails/install/templates/config/sunspot.yml
@@ -3,8 +3,8 @@ production:
     hostname: localhost
     port: 8983
     log_level: WARNING
-    read_timeout: 2
-    open_timeout: 0.5
+    # read_timeout: 2
+    # open_timeout: 0.5
 
 development:
   solr:
@@ -16,4 +16,4 @@ test:
   solr:
     hostname: localhost
     port: 8981
-    log_level: WARNING
+    log_level: WARNING