pull/613/head
Mr Chen 10 months ago
parent 4653667ef1
commit b76a9bf13c
  1. 4
      plugins/mysql-apt/js/mysql-apt.js
  2. 18
      plugins/mysql-yum/js/mysql-yum.js
  3. 16
      plugins/mysql/js/mysql.js

@ -2641,10 +2641,9 @@ function masterOrSlaveConf(version=''){
isHasSign = true; isHasSign = true;
} }
var status = "<a data-id="+i+" class='btlink db_error'>异常</>";
if (mdb_ver >= 8){ if (mdb_ver >= 8){
var status = "<a data-id="+i+" class='btlink db_error'>异常</>";
if (v['Replica_SQL_Running'] == 'Yes' && v['Replica_IO_Running'] == 'Yes'){ if (v['Replica_SQL_Running'] == 'Yes' && v['Replica_IO_Running'] == 'Yes'){
status = "正常"; status = "正常";
} }
@ -2658,7 +2657,6 @@ function masterOrSlaveConf(version=''){
list += '<td>' + rdata.data[i]['Replica_SQL_Running'] +'</td>'; list += '<td>' + rdata.data[i]['Replica_SQL_Running'] +'</td>';
} else { } else {
var status = "<a data-id="+i+" class='btlink db_error'>异常</>";
if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){ if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){
status = "正常"; status = "正常";
} }

@ -2626,6 +2626,8 @@ function masterOrSlaveConf(version=''){
_data['page'] = page; _data['page'] = page;
_data['page_size'] = 10; _data['page_size'] = 10;
var mdb_ver = $('.plugin_version').attr('version');
myPost('get_slave_list', _data, function(data){ myPost('get_slave_list', _data, function(data){
var rdata = $.parseJSON(data.data); var rdata = $.parseJSON(data.data);
var list = ''; var list = '';
@ -2639,6 +2641,20 @@ function masterOrSlaveConf(version=''){
} }
var status = "<a data-id="+i+" class='btlink db_error'>异常</>"; var status = "<a data-id="+i+" class='btlink db_error'>异常</>";
if (mdb_ver >= 8){
if (v['Replica_SQL_Running'] == 'Yes' && v['Replica_IO_Running'] == 'Yes'){
status = "正常";
}
list += '<tr>';
list += '<td>' + rdata.data[i]['Source_Host'] +'</td>';
list += '<td>' + rdata.data[i]['Source_Port'] +'</td>';
list += '<td>' + rdata.data[i]['Source_User'] +'</td>';
list += '<td>' + rdata.data[i]['Relay_Source_Log_File'] +'</td>';
list += '<td>' + rdata.data[i]['Replica_IO_Running'] +'</td>';
list += '<td>' + rdata.data[i]['Replica_SQL_Running'] +'</td>';
} else {
if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){ if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){
status = "正常"; status = "正常";
} }
@ -2650,6 +2666,8 @@ function masterOrSlaveConf(version=''){
list += '<td>' + rdata.data[i]['Master_Log_File'] +'</td>'; list += '<td>' + rdata.data[i]['Master_Log_File'] +'</td>';
list += '<td>' + rdata.data[i]['Slave_IO_Running'] +'</td>'; list += '<td>' + rdata.data[i]['Slave_IO_Running'] +'</td>';
list += '<td>' + rdata.data[i]['Slave_SQL_Running'] +'</td>'; list += '<td>' + rdata.data[i]['Slave_SQL_Running'] +'</td>';
}
if (isHasSign){ if (isHasSign){
list += '<td>' + v['Channel_Name'] +'</td>'; list += '<td>' + v['Channel_Name'] +'</td>';

@ -2625,6 +2625,7 @@ function masterOrSlaveConf(version=''){
_data['page'] = page; _data['page'] = page;
_data['page_size'] = 10; _data['page_size'] = 10;
var mdb_ver = $('.plugin_version').attr('version');
myPost('get_slave_list', _data, function(data){ myPost('get_slave_list', _data, function(data){
var rdata = $.parseJSON(data.data); var rdata = $.parseJSON(data.data);
@ -2639,6 +2640,20 @@ function masterOrSlaveConf(version=''){
} }
var status = "<a data-id="+i+" class='btlink db_error'>异常</>"; var status = "<a data-id="+i+" class='btlink db_error'>异常</>";
if (mdb_ver >= 8){
if (v['Replica_SQL_Running'] == 'Yes' && v['Replica_IO_Running'] == 'Yes'){
status = "正常";
}
list += '<tr>';
list += '<td>' + rdata.data[i]['Source_Host'] +'</td>';
list += '<td>' + rdata.data[i]['Source_Port'] +'</td>';
list += '<td>' + rdata.data[i]['Source_User'] +'</td>';
list += '<td>' + rdata.data[i]['Relay_Source_Log_File'] +'</td>';
list += '<td>' + rdata.data[i]['Replica_IO_Running'] +'</td>';
list += '<td>' + rdata.data[i]['Replica_SQL_Running'] +'</td>';
} else {
if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){ if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){
status = "正常"; status = "正常";
} }
@ -2650,6 +2665,7 @@ function masterOrSlaveConf(version=''){
list += '<td>' + rdata.data[i]['Master_Log_File'] +'</td>'; list += '<td>' + rdata.data[i]['Master_Log_File'] +'</td>';
list += '<td>' + rdata.data[i]['Slave_IO_Running'] +'</td>'; list += '<td>' + rdata.data[i]['Slave_IO_Running'] +'</td>';
list += '<td>' + rdata.data[i]['Slave_SQL_Running'] +'</td>'; list += '<td>' + rdata.data[i]['Slave_SQL_Running'] +'</td>';
}
if (isHasSign){ if (isHasSign){
list += '<td>' + v['Channel_Name'] +'</td>'; list += '<td>' + v['Channel_Name'] +'</td>';

Loading…
Cancel
Save