bug fix: in backups v2

usmannasir · Feb 1, 2024 · f854aaf · f854aaf
1 parent a6f8a85
commit f854aaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/backup/backupManager.py b/backup/backupManager.py
@@ -1859,7 +1859,7 @@ def CreateV2BackupStatus(self, userID=None, data=None):
 
             statusFile = f'/home/cyberpanel/{domain}_rustic_backup_log'
 
-            if ACLManager.CheckStatusFilleLoc(statusFile):
+            if ACLManager.CheckStatusFilleLoc(statusFile, domain):
                 pass
             else:
                 data_ret = {'abort': 1, 'installStatus': 0, 'installationProgress': "100",

diff --git a/plogical/acl.py b/plogical/acl.py
@@ -881,13 +881,19 @@ def CheckDomainBlackList(domain):
         return 1
 
     @staticmethod
-    def CheckStatusFilleLoc(statusFile):
+    def CheckStatusFilleLoc(statusFile, domain=None):
         TemFilePath = statusFile.split('panel/')[1]
 
         try:
             value = int(TemFilePath)
             print(value)
         except:
+            if domain != None:
+                value = statusFile.split('cyberpanel/')[1]
+                #logging.writeToFile(f'value of log file {value}')
+                if value == f'{domain}_rustic_backup_log':
+                    return 1
+
             return 0
 
         if (statusFile[:18] != "/home/cyberpanel/." or statusFile[:16] == "/home/cyberpanel" or statusFile[