From 0c8e03f1524dd27e38a843b521d03b81ad43f3f1 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Wed, 3 Feb 2021 23:20:52 +0800
Subject: [PATCH] up

---
 plugins/mysql/conf/my.cnf    | 3 +++
 plugins/mysql/conf/my8.0.cnf | 2 ++
 plugins/mysql/index.py       | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/mysql/conf/my.cnf b/plugins/mysql/conf/my.cnf
index 53f33cb36..19ce687ed 100644
--- a/plugins/mysql/conf/my.cnf
+++ b/plugins/mysql/conf/my.cnf
@@ -42,6 +42,9 @@ slow-query-log-file={$SERVER_APP_PATH}/data/mysql-slow.log
 long_query_time=3
 #log_queries_not_using_indexes=on
 
+relay-log=mdserver
+relay-log-index=mdserver
+
 #master config
 #binlog-do-db = demo
 #binlog-ignore-db = test
diff --git a/plugins/mysql/conf/my8.0.cnf b/plugins/mysql/conf/my8.0.cnf
index 1a9906952..795bd92c3 100644
--- a/plugins/mysql/conf/my8.0.cnf
+++ b/plugins/mysql/conf/my8.0.cnf
@@ -42,6 +42,8 @@ slow-query-log-file={$SERVER_APP_PATH}/data/mysql-slow.log
 long_query_time=3
 #log_queries_not_using_indexes=on
 
+relay-log=mdserver
+relay-log-index=mdserver
 
 #master config
 #binlog-do-db = demo
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index 5d6f2b2ca..8d215b479 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -1255,7 +1255,7 @@ def getMasterStatus(version=''):
 
     db = pMysqlDb()
     dlist = db.query('show slave status')
-    if len(dlist) > 0 and dlist[0][10] == 'Yes' and dlist[0][11] == 'Yes':
+    if len(dlist) > 0 and (dlist[0][10] == 'Yes' or dlist[0][11] == 'Yes'):
         data['slave_status'] = True
 
     return mw.returnJson(master_status, '设置成功', data)
@@ -1465,7 +1465,7 @@ def setSlaveStatus(version=''):
     db = pMysqlDb()
     dlist = db.query('show slave status')
 
-    if len(dlist) > 0 and dlist[0][10] == 'Yes' and dlist[0][11] == 'Yes':
+    if len(dlist) > 0 and (dlist[0][10] == 'Yes' or dlist[0][11] == 'Yes'):
         db.query('stop slave')
     else:
         db.query('start slave')