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

Fix critical bug in One-Click Backup failure notification logic

Browse Source 
- Fix inverted .find() logic that sent notifications when backups SUCCEEDED
- Add 'status': 'failed' field required by platform API
- Change HTTP to HTTPS for BackupFailedNotify endpoint
- Add comprehensive error handling and logging
- Add 30-second timeout on API requests
- Properly handle actualDomain vs site.domain.domain cases
This commit is contained in:
usmannasir
2025-10-14 16:23:41 +05:00
parent 6381a9ee55
commit c9b711d5bd
1 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
plogical/IncScheduler.py
View File

@@ -930,45 +930,63 @@ Automatic backup failed for %s on %s.
logging.writeToFile(str(directories)) logging.writeToFile(str(directories))
try: try:
# Check if this site's backup exists in the remote folder
backup_found = False
if actualDomain:
check_domain = site.domain
else:
check_domain = site.domain.domain
startCheck = 0
for directory in directories: for directory in directories:
if directory.find(site.domain): # Check if site domain appears in the backup filename
print(f'site in backup, no need to notify {site.domain}') # .find() returns position (>=0) if found, -1 if not found
startCheck = 1 if directory.find(check_domain) != -1:
logging.CyberCPLogFileWriter.writeToFile(f'Backup found for {check_domain} in {directory} [IncScheduler.startNormalBackups]')
backup_found = True
break break
if startCheck: # Only send notification if backup was NOT found (backup failed)
'send notification that backup failed' if not backup_found:
logging.CyberCPLogFileWriter.writeToFile(f'Backup NOT found for {check_domain}, sending failure notification [IncScheduler.startNormalBackups]')
import requests import requests
# Define the URL of the endpoint # Define the URL of the endpoint
url = 'http://platform.cyberpersons.com/Billing/BackupFailedNotify' # Replace with your actual endpoint URL url = 'https://platform.cyberpersons.com/Billing/BackupFailedNotify'
# Define the payload to send in the POST request # Define the payload to send in the POST request
payload = { payload = {
'sub': ocb.subscription, 'sub': ocb.subscription,
'subject': f'Failed to backup {site.domain} on {ACLManager.fetchIP()}.', 'subject': f'Backup Failed for {check_domain} on {ACLManager.fetchIP()}',
'message':f'Hi, \n\n Failed to create backup for {site.domain} on on {ACLManager.fetchIP()}. \n\n Please contact our support team at: http://platform.cyberpersons.com\n\nThank you.', 'message': f'Hi,\n\nFailed to create backup for {check_domain} on {ACLManager.fetchIP()}.\n\nBackup was scheduled but the backup file was not found on the remote server after the backup job completed.\n\nPlease check your server logs for more details or contact support at: https://platform.cyberpersons.com\n\nThank you.',
# Replace with the actual SSH public key
'sftpUser': ocb.sftpUser, 'sftpUser': ocb.sftpUser,
'serverIP': ACLManager.fetchIP(), # Replace with the actual server IP 'serverIP': ACLManager.fetchIP(),
'status': 'failed' # Critical: tells platform to send email
} }
# Convert the payload to JSON format # Convert the payload to JSON format
headers = {'Content-Type': 'application/json'} headers = {'Content-Type': 'application/json'}
dataRet = json.dumps(payload)
# Make the POST request try:
response = requests.post(url, headers=headers, data=dataRet) # Make the POST request with timeout
response = requests.post(url, headers=headers, data=json.dumps(payload), timeout=30)
# # Handle the response if response.status_code == 200:
# # Handle the response response_data = response.json()
# if response.status_code == 200: if response_data.get('status') == 1:
# response_data = response.json() logging.CyberCPLogFileWriter.writeToFile(f'Failure notification sent successfully for {check_domain} [IncScheduler.startNormalBackups]')
# if response_data.get('status') == 1: else:
except: logging.CyberCPLogFileWriter.writeToFile(f'Failure notification API returned error for {check_domain}: {response_data.get("error_message")} [IncScheduler.startNormalBackups]')
pass else:
logging.CyberCPLogFileWriter.writeToFile(f'Failure notification API returned HTTP {response.status_code} for {check_domain} [IncScheduler.startNormalBackups]')
except requests.exceptions.RequestException as e:
logging.CyberCPLogFileWriter.writeToFile(f'Failed to send backup failure notification for {check_domain}: {str(e)} [IncScheduler.startNormalBackups]')
else:
logging.CyberCPLogFileWriter.writeToFile(f'Backup verified successful for {check_domain}, no notification needed [IncScheduler.startNormalBackups]')
except Exception as msg:
logging.CyberCPLogFileWriter.writeToFile(f'Error checking backup status for site: {str(msg)} [IncScheduler.startNormalBackups]')
except: except:
pass pass