bug 556640, sphinx timeout in settings.py

apps/search/sphinxapi.py

@@ -21,7 +21,8 @@ from struct import *
 
 
 # Zamboni customizations
-Z_SPHINX_TIMEOUT = 1
+from django.conf import settings
+Z_SPHINX_TIMEOUT = settings.SPHINX_TIMEOUT
 
 # known searchd commands
 SEARCHD_COMMAND_SEARCH  = 0

settings.py

@@ -419,6 +419,8 @@ TEST_SPHINXQL_PORT = 3407
 TEST_SPHINX_CATALOG_PATH = TMP_PATH + '/test/data/sphinx'
 TEST_SPHINX_LOG_PATH = TMP_PATH + '/test/log/searchd'
 
+SPHINX_TIMEOUT = 1
+
 JAVA_BIN = '/usr/bin/java'
 
 # File paths