From 78f3151c3d861c7f699e5d238c6a6446430dd249 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 7 Nov 2022 10:52:35 +0800 Subject: [PATCH] Update index.py --- plugins/mysql-apt/index.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index 9121cce22..d8a310320 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -507,39 +507,36 @@ def setMyPort(): return mw.returnJson(True, '编辑成功!') -def runInfo(): +def runInfo(version): if status(version) == 'stop': - return mw.returnJson(false, 'MySQL未启动', []) + return mw.returnJson(False, 'MySQL未启动', []) db = pMysqlDb() data = db.query('show global status') - gets = ['Max_used_connections', 'Com_commit', 'Com_rollback', 'Questions', 'Innodb_buffer_pool_reads', 'Innodb_buffer_pool_read_requests', 'Key_reads', 'Key_read_requests', 'Key_writes', + isError = isSqlError(data) + if isError != None: + return isError + + gets = ['Max_used_connections', 'Com_commit', 'Com_select', 'Com_rollback', 'Questions', 'Innodb_buffer_pool_reads', 'Innodb_buffer_pool_read_requests', 'Key_reads', 'Key_read_requests', 'Key_writes', 'Key_write_requests', 'Qcache_hits', 'Qcache_inserts', 'Bytes_received', 'Bytes_sent', 'Aborted_clients', 'Aborted_connects', 'Created_tmp_disk_tables', 'Created_tmp_tables', 'Innodb_buffer_pool_pages_dirty', 'Opened_files', 'Open_tables', 'Opened_tables', 'Select_full_join', 'Select_range_check', 'Sort_merge_passes', 'Table_locks_waited', 'Threads_cached', 'Threads_connected', 'Threads_created', 'Threads_running', 'Connections', 'Uptime'] - try: - # print data - if data[0] == 1045 or data[0] == 2003: - pwd = db.getPwd() - return mw.returnJson(False, 'mysql password error:' + pwd + '!') - except Exception as e: - return mw.returnJson(False, str(e)) - result = {} # print(data) for d in data: + vname = d["Variable_name"] for g in gets: - if d[0] == g: - result[g] = d[1] + if vname == g: + result[g] = d["Value"] # print(result, int(result['Uptime'])) result['Run'] = int(time.time()) - int(result['Uptime']) tmp = db.query('show master status') try: - result['File'] = tmp[0][0] - result['Position'] = tmp[0][1] + result['File'] = tmp[0]["File"] + result['Position'] = tmp[0]["Position"] except: result['File'] = 'OFF' result['Position'] = 'OFF'