pull/109/head
midoks 4 years ago
parent 7af1ef583c
commit 580b623422
  1. 2
      plugins/mysql/conf/my.cnf
  2. 2
      plugins/mysql/conf/my8.0.cnf
  3. 19
      plugins/mysql/index.py
  4. 22
      plugins/mysql/js/mysql.js

@ -47,7 +47,7 @@ long_query_time=3
relay-log=mdserver relay-log=mdserver
relay-log-index=mdserver relay-log-index=mdserver
#master config #master
#binlog-do-db #binlog-do-db
binlog-ignore-db = test binlog-ignore-db = test
binlog-ignore-db = mysql binlog-ignore-db = mysql

@ -45,7 +45,7 @@ long_query_time=3
relay-log=mdserver relay-log=mdserver
relay-log-index=mdserver relay-log-index=mdserver
#master config #master
#binlog-do-db #binlog-do-db
binlog-ignore-db = test binlog-ignore-db = test
binlog-ignore-db = mysql binlog-ignore-db = mysql

@ -1371,7 +1371,6 @@ def setDbSlave(version):
isHas = False isHas = False
for x in xrange(0, len(dodb)): for x in xrange(0, len(dodb)):
if dodb[x][1] == args['name']: if dodb[x][1] == args['name']:
isHas = True isHas = True
@ -1415,6 +1414,24 @@ def setMasterStatus(version=''):
if con.find('#log-bin') != -1: if con.find('#log-bin') != -1:
return mw.returnJson(False, '必须开启二进制日志') return mw.returnJson(False, '必须开启二进制日志')
sign = 'mdserver_ms_open'
dodb = findBinlogDoDb()
if not sign in dodb:
prefix = '#binlog-do-db'
con = con.replace(prefix, prefix + "\nbinlog-do-db=" + sign)
mw.writeFile(conf, con)
else:
con = con.replace("binlog-do-db=" + sign + "\n", '')
rep = r"(binlog-do-db\s*?=\s*?(.*))"
dodb = re.findall(rep, con, re.M)
for x in xrange(0, len(dodb)):
con = con.replace(dodb[x][0] + "\n", '')
mw.writeFile(conf, con)
restart(version)
time.sleep(2)
return mw.returnJson(True, '设置成功') return mw.returnJson(True, '设置成功')

@ -1688,15 +1688,15 @@ function masterOrSlaveConf(version=''){
$(".soft-man-con").html(limitCon); $(".soft-man-con").html(limitCon);
//设置主服务器配置 //设置主服务器配置
// $(".btn-master").click(function () { $(".btn-master").click(function () {
// myPost('set_master_status', 'close=change', function(data){ myPost('set_master_status', 'close=change', function(data){
// var rdata = $.parseJSON(data.data); var rdata = $.parseJSON(data.data);
// layer.msg(rdata.msg, { icon: rdata.status ? 1 : 5 }); layer.msg(rdata.msg, { icon: rdata.status ? 1 : 5 });
// setTimeout(function(){ setTimeout(function(){
// getMasterStatus(); getMasterStatus();
// }, 3000); }, 3000);
// }); });
// }); });
$(".btn-slave").click(function () { $(".btn-slave").click(function () {
myPost('set_slave_status', 'close=change', function(data){ myPost('set_slave_status', 'close=change', function(data){
@ -1708,9 +1708,9 @@ function masterOrSlaveConf(version=''){
}); });
}); });
// if (rdata.status){ if (rdata.status){
getMasterDbList(); getMasterDbList();
// } }
if (rdata.data.slave_status){ if (rdata.data.slave_status){
getAsyncMasterDbList(); getAsyncMasterDbList();

Loading…
Cancel
Save