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

improve logging

Browse Source
This commit is contained in:
Usman Nasir
2020-01-29 11:05:47 +05:00
parent b3ce444860
commit 6ef782252c
7 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
emailMarketing/emailMarketingManager.py
View File

@@ -390,7 +390,7 @@ class EmailMarketingManager:
smtpPassword = data['smtpPassword'] smtpPassword = data['smtpPassword']
if SMTPHosts.objects.count() == 0: 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 = SMTPHosts(owner=admin, host='localhost', port=25, userName='None', password='None')
defaultHost.save() defaultHost.save()

2
plogical/apiAccess.py
View File

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

3
plogical/backupSchedule.py
View File

@@ -50,6 +50,9 @@ class backupSchedule:
finalData = json.dumps({'randomFile': pathToFile, 'websiteToBeBacked': virtualHost}) finalData = json.dumps({'randomFile': pathToFile, 'websiteToBeBacked': virtualHost})
r = requests.post("https://localhost:8090/backup/localInitiate", data=finalData, verify=False) 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) data = json.loads(r.text)
tempStoragePath = data['tempStorage'] tempStoragePath = data['tempStorage']

2
plogical/backupUtilities.py
View File

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

2
plogical/cPanelImporter.py
View File

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

4
plogical/remoteTransferUtilities.py
View File

@@ -164,8 +164,10 @@ class remoteTransferUtilities:
writeToFile.close() writeToFile.close()
else: else:
writeToFile = open(backupLogPath, "a")
writeToFile.writelines("[" + time.strftime( 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: except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [remoteTransferUtilities.backupProcess:173]") logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [remoteTransferUtilities.backupProcess:173]")

2
s3Backups/s3Backups.py
View File

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