diff --git a/packages/packagesManager.py b/packages/packagesManager.py index f6ebc9fba..c5893bd7e 100755 --- a/packages/packagesManager.py +++ b/packages/packagesManager.py @@ -211,6 +211,16 @@ class PackagesManager: 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"} json_data = json.dumps(data_ret) return HttpResponse(json_data) diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py index 2462ddea0..33694e41d 100644 --- a/plogical/IncScheduler.py +++ b/plogical/IncScheduler.py @@ -1,11 +1,9 @@ #!/usr/local/CyberCP/bin/python import os.path import sys - sys.path.append('/usr/local/CyberCP') os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") import django - django.setup() from IncBackups.IncBackupsControl import IncJobs from IncBackups.models import BackupJob @@ -56,8 +54,11 @@ class IncScheduler(multi.Thread): self.data = extraArgs def run(self): - if self.function == 'startBackup': + if self.function == "startBackup": IncScheduler.startBackup(self.data['freq']) + elif self.function == "CalculateAndUpdateDiskUsage": + logging.writeToFile('called CalculateAndUpdateDiskUsage etc') + IncScheduler.CalculateAndUpdateDiskUsage() @staticmethod def startBackup(type): @@ -1369,6 +1370,10 @@ def main(): parser.add_argument('--planName', help='Plan name for AWS!') 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': IncScheduler.RemoteBackup(args.function) return 0 diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 9edb94b3e..9d19988ce 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -2796,6 +2796,17 @@ class WebsiteManager: 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"} json_data = json.dumps(data_ret) return HttpResponse(json_data)