improve logging

emailMarketing/emailMarketingManager.py

@@ -390,7 +390,7 @@ class EmailMarketingManager:
             smtpPassword = data['smtpPassword']
 
             if SMTPHosts.objects.count() == 0:
-                admin = Administrator.objects.get(pk=1)
+                admin = Administrator.objects.get(userName='admin')
                 defaultHost = SMTPHosts(owner=admin, host='localhost', port=25, userName='None', password='None')
                 defaultHost.save()
 

plogical/apiAccess.py

@@ -8,7 +8,7 @@ django.setup()
 from loginSystem.models import Administrator, ACL
 
 def main():
-    admin = Administrator.objects.get(pk=1)
+    admin = Administrator.objects.get(userName='admin')
     admin.api = 1
     admin.save()
 

plogical/backupSchedule.py

@@ -50,6 +50,9 @@ class backupSchedule:
             finalData = json.dumps({'randomFile': pathToFile, 'websiteToBeBacked': virtualHost})
             r = requests.post("https://localhost:8090/backup/localInitiate", data=finalData, verify=False)
 
+            if os.path.exists(ProcessUtilities.debugPath):
+                logging.CyberCPLogFileWriter.writeToFile(r.text)
+
             data = json.loads(r.text)
             tempStoragePath = data['tempStorage']
 

plogical/backupUtilities.py

@@ -465,7 +465,7 @@ class backupUtilities:
             else:
                 path = "/home/backup/" + backupFile
 
-            admin = Administrator.objects.get(pk=1)
+            admin = Administrator.objects.get(userName='admin')
 
             ## open meta file to read data
 

plogical/cPanelImporter.py

@@ -496,7 +496,7 @@ class cPanelImporter:
             f = open(ipFile)
             ipData = f.read()
             ipAddress = ipData.split('\n', 1)[0]
-            admin = Administrator.objects.get(pk=1)
+            admin = Administrator.objects.get(userName='admin')
 
             CompletPathToExtractedArchive = cPanelImporter.mainBackupPath + self.fileName
             DNSZonesPath = '%s/dnszones' % (CompletPathToExtractedArchive)

plogical/remoteTransferUtilities.py

@@ -164,8 +164,10 @@ class remoteTransferUtilities:
 
                             writeToFile.close()
                         else:
+                            writeToFile = open(backupLogPath, "a")
                             writeToFile.writelines("[" + time.strftime(
-                                "%m.%d.%Y_%H-%M-%S") + "]" + "Failed to generate local backup for: " + virtualHost + "\n")
+                                "%m.%d.%Y_%H-%M-%S") + "]" + "Failed to generate local backup for: " + virtualHost + ". Error message: %s\n" % (retValue[1]))
+                            writeToFile.close()
 
                     except BaseException as msg:
                         logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [remoteTransferUtilities.backupProcess:173]")

s3Backups/s3Backups.py

@@ -1302,7 +1302,7 @@ class S3Backups(multi.Thread):
 
     def runAWSBackups(self):
         try:
-            admin = Administrator.objects.get(pk=1)
+            admin = Administrator.objects.get(userName='admin')
             self.request.session['userID'] = admin.pk
 
             for plan in BackupPlan.objects.all():