From 6ef782252c27ae92ca5b12f6d3fbd26869491ecd Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 29 Jan 2020 11:05:47 +0500 Subject: [PATCH] improve logging --- emailMarketing/emailMarketingManager.py | 2 +- plogical/apiAccess.py | 2 +- plogical/backupSchedule.py | 3 +++ plogical/backupUtilities.py | 2 +- plogical/cPanelImporter.py | 2 +- plogical/remoteTransferUtilities.py | 4 +++- s3Backups/s3Backups.py | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/emailMarketing/emailMarketingManager.py b/emailMarketing/emailMarketingManager.py index 41e98f006..fdc890f09 100755 --- a/emailMarketing/emailMarketingManager.py +++ b/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() diff --git a/plogical/apiAccess.py b/plogical/apiAccess.py index 1c5ec1d38..503d7314e 100755 --- a/plogical/apiAccess.py +++ b/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() diff --git a/plogical/backupSchedule.py b/plogical/backupSchedule.py index c49c6ac6a..9deecdb66 100755 --- a/plogical/backupSchedule.py +++ b/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'] diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py index 3fcd121c4..71b279993 100755 --- a/plogical/backupUtilities.py +++ b/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 diff --git a/plogical/cPanelImporter.py b/plogical/cPanelImporter.py index dfdafd145..c8402b576 100644 --- a/plogical/cPanelImporter.py +++ b/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) diff --git a/plogical/remoteTransferUtilities.py b/plogical/remoteTransferUtilities.py index e3a23831d..5df7b9b91 100755 --- a/plogical/remoteTransferUtilities.py +++ b/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]") diff --git a/s3Backups/s3Backups.py b/s3Backups/s3Backups.py index dab2cf354..1031d42f9 100755 --- a/s3Backups/s3Backups.py +++ b/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():