diff --git a/plugins/sphinx/index.py b/plugins/sphinx/index.py index 2e42790f0..75e8a3f4a 100755 --- a/plugins/sphinx/index.py +++ b/plugins/sphinx/index.py @@ -5,6 +5,7 @@ import io import os import time import re +import string import subprocess sys.path.append(os.getcwd() + "/class/core") @@ -235,11 +236,30 @@ def runStatus(): def sphinxCmd(): file = getConf() + bin_dir = getServerDir() content = public.readFile(file) - print content rep = 'index\s(.*)' - tmp = re.findall(rep, content) - print tmp + sindex = re.findall(rep, content) + indexlen = len(sindex) + if indexlen > 0: + cmd = {} + cmd_index = [] + cmd_delta = [] + for x in range(indexlen): + if string.find(sindex[x], ':') != -1: + t = sindex[x].split(':') + cmd_delta.append(t[0].strip()) + else: + cmd_index.append(sindex[x]) + + cmd['index'] = cmd_index + cmd['delta'] = cmd_delta + cmd['cmd'] = bin_dir + '/bin/bin/searchd -c ' + bin_dir + '/sphinx.conf' + + return public.returnJson(True, 'ok', cmd) + else: + return public.returnJson(False, 'no index') + if __name__ == "__main__": func = sys.argv[1] diff --git a/plugins/sphinx/js/sphinx.js b/plugins/sphinx/js/sphinx.js index 5c64d94fd..b652ffec8 100755 --- a/plugins/sphinx/js/sphinx.js +++ b/plugins/sphinx/js/sphinx.js @@ -55,7 +55,7 @@ function runStatus(){ } var idata = rdata.data; console.log(idata); - var Con = '
运行时间 | ' + idata.uptime + 's | 每秒查询 | ' + parseInt(parseInt(idata.queries) / parseInt(idata.uptime)) + ' |
---|---|---|---|
总连接次数 | ' + idata.connections + ' | work_queue_length | ' +idata.work_queue_length + ' |