|
|
@ -701,7 +701,7 @@ def getDbBackupList(): |
|
|
|
r = getDbBackupListFunc(args['name']) |
|
|
|
r = getDbBackupListFunc(args['name']) |
|
|
|
bkDir = mw.getRootDir() + '/backup/database' |
|
|
|
bkDir = mw.getRootDir() + '/backup/database' |
|
|
|
rr = [] |
|
|
|
rr = [] |
|
|
|
for x in xrange(0, len(r)): |
|
|
|
for x in range(0, len(r)): |
|
|
|
p = bkDir + '/' + r[x] |
|
|
|
p = bkDir + '/' + r[x] |
|
|
|
data = {} |
|
|
|
data = {} |
|
|
|
data['name'] = r[x] |
|
|
|
data['name'] = r[x] |
|
|
@ -1305,7 +1305,7 @@ def getMasterDbList(version=''): |
|
|
|
field).limit(limit).order('id desc').select() |
|
|
|
field).limit(limit).order('id desc').select() |
|
|
|
count = conn.where(condition, ()).count() |
|
|
|
count = conn.where(condition, ()).count() |
|
|
|
|
|
|
|
|
|
|
|
for x in xrange(0, len(clist)): |
|
|
|
for x in range(0, len(clist)): |
|
|
|
if clist[x]['name'] in dodb: |
|
|
|
if clist[x]['name'] in dodb: |
|
|
|
clist[x]['master'] = 1 |
|
|
|
clist[x]['master'] = 1 |
|
|
|
else: |
|
|
|
else: |
|
|
@ -1339,7 +1339,7 @@ def setDbMaster(version): |
|
|
|
dodb = re.findall(rep, con, re.M) |
|
|
|
dodb = re.findall(rep, con, re.M) |
|
|
|
|
|
|
|
|
|
|
|
isHas = False |
|
|
|
isHas = False |
|
|
|
for x in xrange(0, len(dodb)): |
|
|
|
for x in range(0, len(dodb)): |
|
|
|
|
|
|
|
|
|
|
|
if dodb[x][1] == args['name']: |
|
|
|
if dodb[x][1] == args['name']: |
|
|
|
isHas = True |
|
|
|
isHas = True |
|
|
@ -1370,7 +1370,7 @@ def setDbSlave(version): |
|
|
|
dodb = re.findall(rep, con, re.M) |
|
|
|
dodb = re.findall(rep, con, re.M) |
|
|
|
|
|
|
|
|
|
|
|
isHas = False |
|
|
|
isHas = False |
|
|
|
for x in xrange(0, len(dodb)): |
|
|
|
for x in range(0, len(dodb)): |
|
|
|
if dodb[x][1] == args['name']: |
|
|
|
if dodb[x][1] == args['name']: |
|
|
|
isHas = True |
|
|
|
isHas = True |
|
|
|
|
|
|
|
|
|
|
@ -1426,7 +1426,7 @@ def setMasterStatus(version=''): |
|
|
|
con = con.replace("binlog-do-db=" + sign + "\n", '') |
|
|
|
con = con.replace("binlog-do-db=" + sign + "\n", '') |
|
|
|
rep = r"(binlog-do-db\s*?=\s*?(.*))" |
|
|
|
rep = r"(binlog-do-db\s*?=\s*?(.*))" |
|
|
|
dodb = re.findall(rep, con, re.M) |
|
|
|
dodb = re.findall(rep, con, re.M) |
|
|
|
for x in xrange(0, len(dodb)): |
|
|
|
for x in range(0, len(dodb)): |
|
|
|
con = con.replace(dodb[x][0] + "\n", '') |
|
|
|
con = con.replace(dodb[x][0] + "\n", '') |
|
|
|
mw.writeFile(conf, con) |
|
|
|
mw.writeFile(conf, con) |
|
|
|
|
|
|
|
|
|
|
@ -1602,7 +1602,7 @@ def getSlaveList(version=''): |
|
|
|
|
|
|
|
|
|
|
|
# print(dlist) |
|
|
|
# print(dlist) |
|
|
|
ret = [] |
|
|
|
ret = [] |
|
|
|
for x in xrange(0, len(dlist)): |
|
|
|
for x in range(0, len(dlist)): |
|
|
|
tmp = {} |
|
|
|
tmp = {} |
|
|
|
tmp['Master_User'] = dlist[x][2] |
|
|
|
tmp['Master_User'] = dlist[x][2] |
|
|
|
tmp['Master_Host'] = dlist[x][1] |
|
|
|
tmp['Master_Host'] = dlist[x][1] |
|
|
|