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

resolve https://github.com/usmannasir/cyberpanel/issues/998

Browse Source
This commit is contained in:
usman@cyberpersons.com
2022-12-03 16:49:27 +05:00
parent 45f9bd1a60
commit 6a7aef800f
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/packagesManager.py
View File

@@ -211,6 +211,16 @@ class PackagesManager:
modifyPack.save() modifyPack.save()
## Fix https://github.com/usmannasir/cyberpanel/issues/998
# from plogical.IncScheduler import IncScheduler
# isPU = IncScheduler('CalculateAndUpdateDiskUsage', {})
# isPU.start()
from plogical.processUtilities import ProcessUtilities
command = '/usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/IncScheduler.py UpdateDiskUsageForce'
ProcessUtilities.outputExecutioner(command)
data_ret = {'status': 1, 'saveStatus': 1, 'error_message': "None"} data_ret = {'status': 1, 'saveStatus': 1, 'error_message': "None"}
json_data = json.dumps(data_ret) json_data = json.dumps(data_ret)
return HttpResponse(json_data) return HttpResponse(json_data)

11
plogical/IncScheduler.py
View File

@@ -1,11 +1,9 @@
#!/usr/local/CyberCP/bin/python #!/usr/local/CyberCP/bin/python
import os.path import os.path
import sys import sys
sys.path.append('/usr/local/CyberCP') sys.path.append('/usr/local/CyberCP')
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
import django import django
django.setup() django.setup()
from IncBackups.IncBackupsControl import IncJobs from IncBackups.IncBackupsControl import IncJobs
from IncBackups.models import BackupJob from IncBackups.models import BackupJob
@@ -56,8 +54,11 @@ class IncScheduler(multi.Thread):
self.data = extraArgs self.data = extraArgs
def run(self): def run(self):
if self.function == 'startBackup': if self.function == "startBackup":
IncScheduler.startBackup(self.data['freq']) IncScheduler.startBackup(self.data['freq'])
elif self.function == "CalculateAndUpdateDiskUsage":
logging.writeToFile('called CalculateAndUpdateDiskUsage etc')
IncScheduler.CalculateAndUpdateDiskUsage()
@staticmethod @staticmethod
def startBackup(type): def startBackup(type):
@@ -1369,6 +1370,10 @@ def main():
parser.add_argument('--planName', help='Plan name for AWS!') parser.add_argument('--planName', help='Plan name for AWS!')
args = parser.parse_args() args = parser.parse_args()
if args.function == 'UpdateDiskUsageForce':
IncScheduler.CalculateAndUpdateDiskUsage()
return 0
if args.function == '30 Minutes' or args.function == '30 Minutes' or args.function == '1 Hour' or args.function == '6 Hours' or args.function == '12 Hours' or args.function == '1 Day' or args.function == '3 Days' or args.function == '1 Week': if args.function == '30 Minutes' or args.function == '30 Minutes' or args.function == '1 Hour' or args.function == '6 Hours' or args.function == '12 Hours' or args.function == '1 Day' or args.function == '3 Days' or args.function == '1 Week':
IncScheduler.RemoteBackup(args.function) IncScheduler.RemoteBackup(args.function)
return 0 return 0

11
websiteFunctions/website.py
View File

@@ -2796,6 +2796,17 @@ class WebsiteManager:
modifyWeb.save() modifyWeb.save()
## Fix https://github.com/usmannasir/cyberpanel/issues/998
# from plogical.IncScheduler import IncScheduler
# isPU = IncScheduler('CalculateAndUpdateDiskUsage', {})
# isPU.start()
command = '/usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/IncScheduler.py UpdateDiskUsageForce'
ProcessUtilities.outputExecutioner(command)
##
data_ret = {'status': 1, 'saveStatus': 1, 'error_message': "None"} data_ret = {'status': 1, 'saveStatus': 1, 'error_message': "None"}
json_data = json.dumps(data_ret) json_data = json.dumps(data_ret)
return HttpResponse(json_data) return HttpResponse(json_data)