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

bug fix in template loading

Browse Source
This commit is contained in:
Usman Nasir
2021-03-25 20:46:04 +05:00
parent 4c07893075
commit 0959ae4056
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backup/backupManager.py
View File

@@ -345,7 +345,7 @@ class BackupManager:
def restoreSite(self, request=None, userID=None, data=None): def restoreSite(self, request=None, userID=None, data=None):
path = os.path.join("/home", "backup") path = os.path.join("/home", "backup")
if not os.path.exists(path): if not os.path.exists(path):
proc = httpProc(request, 'backup/restore.html', 'restoreBackup') proc = httpProc(request, 'backup/restore.html', None, 'restoreBackup')
return proc.render() return proc.render()
else: else:
all_files = [] all_files = []
@@ -969,7 +969,7 @@ class BackupManager:
return HttpResponse(final_json) return HttpResponse(final_json)
def remoteBackups(self, request, userID=None, data=None): def remoteBackups(self, request, userID=None, data=None):
proc = httpProc(request, 'backup/remoteBackups.html', 'remoteBackups') proc = httpProc(request, 'backup/remoteBackups.html', None, 'remoteBackups')
return proc.render() return proc.render()
def submitRemoteBackups(self, userID=None, data=None): def submitRemoteBackups(self, userID=None, data=None):

7
plogical/backupUtilities.py
View File

@@ -1939,8 +1939,9 @@ def submitBackupCreation(tempStoragePath, backupName, backupPath, backupDomain):
+ backupName + " --backupPath " + backupPath + ' --backupDomain ' + backupDomain + ' --metaPath %s' % ( + backupName + " --backupPath " + backupPath + ' --backupDomain ' + backupDomain + ' --metaPath %s' % (
result[2]) result[2])
output = ProcessUtilities.outputExecutioner(execPath, website.externalApp) output = ProcessUtilities.outputExecutioner(execPath)
if output.find('[5009') > -1:
if output.find('[5009]') > -1:
logging.CyberCPLogFileWriter.writeToFile(output) logging.CyberCPLogFileWriter.writeToFile(output)
writeToFile = open(schedulerPath, 'w') writeToFile = open(schedulerPath, 'w')
writeToFile.writelines(output) writeToFile.writelines(output)
@@ -1968,7 +1969,7 @@ def submitBackupCreation(tempStoragePath, backupName, backupPath, backupDomain):
## ##
output = ProcessUtilities.outputExecutioner(execPath, website.externalApp) #output = ProcessUtilities.outputExecutioner(execPath, website.externalApp)
if output.find('1,None') > -1: if output.find('1,None') > -1:
execPath = "sudo nice -n 10 /usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/backupUtilities.py" execPath = "sudo nice -n 10 /usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/backupUtilities.py"