stale/py-phias
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлена настройка соединения Sphinx (возможен Unix Socket)

Browse Source
This commit is contained in:
Jack Stdin 2016-02-21 00:15:12 +03:00
parent c2799674b3
commit 5a5c2211db
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aore/config/common.py
View File

@ -5,8 +5,7 @@ class basic:
class sphinx_conf: class sphinx_conf:
host_name = "localhost" listen = "127.0.0.1:9312"
port = 9312
index_addjobj = "idx_fias_addrobj" index_addjobj = "idx_fias_addrobj"
index_sugg = "idx_fias_sugg" index_sugg = "idx_fias_sugg"
var_dir = None var_dir = None

3
aore/config/dev.py
View File

@ -4,8 +4,7 @@ from __future__ import absolute_import
from .common import * from .common import *
sphinx_conf.host_name = "localhost" sphinx_conf.listen = "127.0.0.1:9312"
sphinx_conf.port = 9312
sphinx_conf.var_dir = "C:\\Sphinx" sphinx_conf.var_dir = "C:\\Sphinx"
db_conf.database = "postgres" db_conf.database = "postgres"

11
aore/fias/search.py
View File

@ -25,13 +25,20 @@ class SphinxSearch:
def __init__(self, db): def __init__(self, db):
self.db = db self.db = db
sphinx_host = sphinx_conf.listen
sphinx_port = None
if ":" in sphinx_conf.listen:
sphinx_host, sphinx_port = sphinx_conf.listen.split(":")
sphinx_port = int(sphinx_port)
self.client_sugg = sphinxapi.SphinxClient() self.client_sugg = sphinxapi.SphinxClient()
self.client_sugg.SetServer(sphinx_conf.host_name, sphinx_conf.port) self.client_sugg.SetServer(sphinx_host, sphinx_port)
self.client_sugg.SetLimits(0, self.max_result) self.client_sugg.SetLimits(0, self.max_result)
self.client_sugg.SetConnectTimeout(3.0) self.client_sugg.SetConnectTimeout(3.0)
self.client_show = sphinxapi.SphinxClient() self.client_show = sphinxapi.SphinxClient()
self.client_show.SetServer(sphinx_conf.host_name, sphinx_conf.port) self.client_show.SetServer(sphinx_host, sphinx_port)
self.client_show.SetLimits(0, self.max_result) self.client_show.SetLimits(0, self.max_result)
self.client_show.SetConnectTimeout(3.0) self.client_show.SetConnectTimeout(3.0)

4
aore/miscutils/sphinx.py
View File

@ -21,7 +21,6 @@ class SphinxHelper:
if not os.path.exists(folders.temp): if not os.path.exists(folders.temp):
os.makedirs(folders.temp) os.makedirs(folders.temp)
def configure_indexer(self, indexer_binary, config_filename): def configure_indexer(self, indexer_binary, config_filename):
logging.info("Start configuring Sphinx...") logging.info("Start configuring Sphinx...")
self.index_binary = indexer_binary self.index_binary = indexer_binary
@ -144,7 +143,8 @@ class SphinxHelper:
out_filename = os.path.abspath(config_fname) out_filename = os.path.abspath(config_fname)
logging.info("Creating main config %s...", out_filename) logging.info("Creating main config %s...", out_filename)
conf_data = template('aore/templates/sphinx/sphinx.conf', sphinx_var_path=sphinx_conf.var_dir) conf_data = template('aore/templates/sphinx/sphinx.conf', sphinx_listen=sphinx_conf.listen,
sphinx_var_path=sphinx_conf.var_dir)
f = open(out_filename, "w") f = open(out_filename, "w")
for fname, fpath in self.files.iteritems(): for fname, fpath in self.files.iteritems():

2
aore/templates/sphinx/sphinx.conf
View File

@ -18,7 +18,7 @@ indexer
searchd searchd
{ {
listen = 127.0.0.1:9312 listen = {{ sphinx_listen }}
# required by RT-indexes # required by RT-indexes
workers = threads workers = threads