bug fix: upload large files to s3

This commit is contained in:
usmannasir
2018-12-24 20:21:14 +05:00
parent db15dc03ed
commit 22646cdb5c
6 changed files with 79 additions and 20 deletions

View File

@@ -22,6 +22,7 @@ from highAvailability.haManager import HAManager
from plogical.httpProc import httpProc
from s3Backups.s3Backups import S3Backups
import os
from serverStatus.views import topProcessesStatus, killProcess
class CloudManager:
def __init__(self, data=None, admin = None):
@@ -911,3 +912,18 @@ class CloudManager:
return self.ajaxPre(1, None)
except BaseException, msg:
return self.ajaxPre(0, str(msg))
def systemStatus(self, request):
try:
return topProcessesStatus(request)
except BaseException, msg:
return self.ajaxPre(0, str(msg))
def killProcess(self, request):
try:
request.session['userID'] = self.admin.pk
return killProcess(request)
except BaseException, msg:
return self.ajaxPre(0, str(msg))

View File

@@ -197,6 +197,10 @@ def router(request):
return cm.fetchBackupLogs(request)
elif controller == 'forceRunAWSBackup':
return cm.forceRunAWSBackup(request)
elif controller == 'systemStatus':
return cm.systemStatus(request)
elif controller == 'killProcess':
return cm.killProcess(request)
else:
return cm.ajaxPre(0, 'This function is not available in your version of CyberPanel.')