Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-08 06:16:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: fetch db user

Browse Source
This commit is contained in:
Usman Nasir
2020-01-23 15:07:37 +05:00
parent 2549404931
commit 4fddc9b5eb
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
IncBackups/IncBackupsControl.py
View File

@@ -455,23 +455,20 @@ class IncJobs(multi.Thread):
userToTry = items.dbUser
except:
dbusers = DBUsers.objects.all().filter(user=items.dbUser)
userToTry = items.dbUser
for it in dbusers:
dbuser = it
break
userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbUser)
if userToTry == 0:
userToTry = items.dbName
userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbName)
try:
dbuser = DBUsers.objects.get(user=userToTry)
except:
dbusers = DBUsers.objects.all().filter(user=userToTry)
for it in dbusers:
dbuser = it
break
if it.find('_') > -1:
dbuser = it
break
databaseXML = Element('database')

7
plogical/backupUtilities.py
View File

@@ -113,7 +113,7 @@ class backupUtilities:
dbuser = it
break
userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbUser)
userToTry = mysqlUtilities.mysqlUtilities.fetchuser(items.dbName)
try:
dbuser = DBUsers.objects.get(user=userToTry)
@@ -121,8 +121,9 @@ class backupUtilities:
try:
dbusers = DBUsers.objects.all().filter(user=userToTry)
for it in dbusers:
dbuser = it
break
if it.find('_') > -1:
dbuser = it
break
except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(
'While creating backup for %s, we failed to backup database %s. Error message: %s' % (