Merge pull request #787 from midoks/dev

manticoresearch状态修复

plugins/manticoresearch/index.html

@@ -19,7 +19,7 @@
 			<p onclick="pluginConfigTpl('manticoresearch','', 'conf','config_tpl','read_config_tpl',tryRebuildIndex);">配置修改</p>
 			<p onclick="pluginLogs('manticoresearch','','run_log',30);">运行日志</p>
 			<p onclick="pluginLogs('manticoresearch','','query_log', 30);">查询日志</p>
-			<!-- <p onclick="mcsRunStatus();">运行状态</p> -->
+			<p onclick="mcsRunStatus();">运行状态</p>
 			<p onclick="mcsCommonFunc();">常用功能</p>
 			<p onclick="mcsReadme();">说明</p>
 		</div>

plugins/manticoresearch/index.py

@@ -128,6 +128,13 @@ def mkdirAll():
         else:
             mw.execShell('mkdir -p ' + os.path.dirname(x))
 
+def isInitFile():
+    path = getServerDir() + '/init.pl'
+    if os.path.exists(path):
+        return True
+    mw.writeFile(path, 'ok')
+    return False
+
 def initDreplace():
 
     dirs_list = [
@@ -145,7 +152,7 @@ def initDreplace():
 
     # config replace
     conf_bin = getConf()
-    if not os.path.exists(conf_bin):
+    if not os.path.exists(conf_bin) or not isInitFile():
         conf_content = mw.readFile(getConfTpl())
         conf_content = contentReplace(conf_content)
         mw.writeFile(getConf(), conf_content)
@@ -272,10 +279,38 @@ def runStatus():
     if s != 'start':
         return mw.returnJson(False, '没有启动程序')
 
-    port = getHttpPort()
+    sys.path.append(getPluginDir() + "/class")
-    url = "http://127.0.0.1:"+port+"/status"
+    import sphinxapi
-    data = mw.httpGet(url)
+
-    return mw.returnJson(True, 'ok', data)
+    sh = sphinxapi.SphinxClient()
+    port = getMainPort()
+    sh.SetServer('127.0.0.1', port)
+    info_status = sh.Status()
+
+    rData = {}
+    for x in range(len(info_status)):
+        rData[info_status[x][0]] = info_status[x][1]
+
+    return mw.returnJson(True, 'ok', rData)
+
+def runStatusTest():
+    s = status()
+    if s != 'start':
+        return mw.returnJson(False, '没有启动程序')
+
+    sys.path.append(getPluginDir() + "/class")
+    import sphinxapi
+
+    sh = sphinxapi.SphinxClient()
+    port = getMainPort()
+    sh.SetServer('127.0.0.1', port)
+    info_status = sh.Status()
+
+    rData = {}
+    for x in range(len(info_status)):
+        rData[info_status[x][0]] = info_status[x][1]
+
+    return mw.returnJson(True, 'ok', rData)
 
 
 def sphinxConfParse():
@@ -454,6 +489,8 @@ if __name__ == "__main__":
         print(queryLog())
     elif func == 'run_status':
         print(runStatus())
+    elif func == 'run_status_test':
+        print(runStatusTest())
     elif func == 'sphinx_cmd':
         print(sphinxCmd())
     elif func == 'db_to_sphinx':

plugins/manticoresearch/install.sh

@@ -10,6 +10,7 @@ sysName=`uname`
 sysArch=`arch`
 
 # 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
 # systemctl status manticore
 
 if [ -f ${rootPath}/bin/activate ];then