makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/sphinx-fulltext-search] fix sphinx for arbitary host

Browse source 
PHPBB3-10946
This commit is contained in:
Dhruv 2012-07-26 17:32:06 +05:30
parent eb4298c646
commit a6b5b2784f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/search/fulltext_sphinx.php
View file

@ -82,8 +82,7 @@ class phpbb_search_fulltext_sphinx
$this->sphinx = new SphinxClient(); $this->sphinx = new SphinxClient();
// We only support localhost for now $this->sphinx->SetServer(($this->config['fulltext_sphinx_host'] ? $this->config['fulltext_sphinx_host'] : 'localhost'), ($this->config['fulltext_sphinx_port'] ? (int) $this->config['fulltext_sphinx_port'] : 3312));
$this->sphinx->SetServer('localhost', (isset($this->config['fulltext_sphinx_port']) && $this->config['fulltext_sphinx_port']) ? (int) $this->config['fulltext_sphinx_port'] : 3312);
$error = false; $error = false;
} }
@ -162,7 +161,8 @@ class phpbb_search_fulltext_sphinx
$config_data = array( $config_data = array(
'source source_phpbb_' . $this->id . '_main' => array( 'source source_phpbb_' . $this->id . '_main' => array(
array('type', $this->dbtype), array('type', $this->dbtype),
array('sql_host', $this->config['fulltext_sphinx_host'] ? $this->config['fulltext_sphinx_host'] : $dbhost), // This config value sql_host needs to be changed incase sphinx and sql are on different servers
array('sql_host', $dbhost),
array('sql_user', $dbuser), array('sql_user', $dbuser),
array('sql_pass', $dbpasswd), array('sql_pass', $dbpasswd),
array('sql_db', $dbname), array('sql_db', $dbname),
@ -241,7 +241,7 @@ class phpbb_search_fulltext_sphinx
), ),
'searchd' => array( 'searchd' => array(
array('compat_sphinxql_magics' , '0'), array('compat_sphinxql_magics' , '0'),
array('listen' , 'localhost' . ':' . ($this->config['fulltext_sphinx_port'] ? $this->config['fulltext_sphinx_port'] : '3312')), array('listen' , ($this->config['fulltext_sphinx_host'] ? $this->config['fulltext_sphinx_host'] : 'localhost') . ':' . ($this->config['fulltext_sphinx_port'] ? $this->config['fulltext_sphinx_port'] : '3312')),
array('log', $this->config['fulltext_sphinx_data_path'] . 'log/searchd.log'), array('log', $this->config['fulltext_sphinx_data_path'] . 'log/searchd.log'),
array('query_log', $this->config['fulltext_sphinx_data_path'] . 'log/sphinx-query.log'), array('query_log', $this->config['fulltext_sphinx_data_path'] . 'log/sphinx-query.log'),
array('read_timeout', '5'), array('read_timeout', '5'),