Merge pull request #966 from midoks/dev

常规优化

plugins/manticoresearch/conf/manticore.conf

@@ -3,7 +3,7 @@ indexer {
 }
 
 searchd {
-    listen = 127.0.0.1:9322:sphinx
+    listen = 127.0.0.1:9322
     listen = 127.0.0.1:9326:mysql
     listen = 127.0.0.1:9328:http
     log = /var/log/manticore/searchd.log

plugins/manticoresearch/index.py

@@ -208,7 +208,6 @@ def reload():
 
 
 def rebuild():
-    fixIndexOwner()
     cmd = 'indexer --all --rotate'
     cmd_manticore = asManticore(cmd)
     data = mw.execShell(cmd_manticore)
@@ -294,7 +293,7 @@ def runStatus():
 
     sh = sphinxapi.SphinxClient()
     port = getMainPort()
-    sh.SetServer('127.0.0.1', int(port))
+    sh.SetServer('127.0.0.1', port)
     info_status = sh.Status()
 
     if info_status is None:

plugins/manticoresearch/install.sh

@@ -9,7 +9,7 @@ serverPath=$(dirname "$rootPath")
 sysName=`uname`
 sysArch=`arch`
 
-# cd /www/server/mdserver-web/plugins/manticoresearch && bash install.sh install latest
+# cd /www/server/mdserver-web/plugins/manticoresearch && bash install.sh install 7.4.6
 # cd /www/server/mdserver-web && python3 plugins/manticoresearch/index.py run_status_test
 # cd /www/server/mdserver-web && python3 plugins/manticoresearch/index.py start
 

plugins/manticoresearch/tpl/discuz.conf

@@ -3,7 +3,7 @@
 #
 
 searchd {
-    listen = 127.0.0.1:9322:sphinx
+    listen = 127.0.0.1:9322
     listen = 127.0.0.1:9326:mysql
     listen = 127.0.0.1:9328:http
     log = /var/log/manticore/searchd.log

plugins/manticoresearch/tpl/none.conf

@@ -1,5 +1,5 @@
 searchd {
-    listen = 127.0.0.1:9322:sphinx
+    listen = 127.0.0.1:9322
     listen = 127.0.0.1:9326:mysql
     listen = 127.0.0.1:9328:http
     log = /var/log/manticore/searchd.log