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

Add cron job management for website suspension: Implement methods to suspend, restore, and check the status of cron jobs for websites. Update main function to handle new commands for cron management. Enhance child domain handling to ensure cron jobs are suspended/restored appropriately during website suspension processes.

Browse Source 
https://github.com/usmannasir/cyberpanel/issues/1097
This commit is contained in:
Master3395
2025-09-21 20:45:37 +02:00
parent 48c9c1ad6a
commit cc07f12017
2 changed files with 204 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
websiteFunctions/website.py
View File

@@ -3151,9 +3151,27 @@ context /cyberpanel_suspension_page.html {
except:
pass
# Apply same suspension configuration to child domains
# Suspend cron jobs for child domains
childDomains = website.childdomains_set.all()
for items in childDomains:
# Suspend cron jobs for child domain
try:
CronUtil.CronPrem(1)
execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/cronUtil.py"
execPath = execPath + " suspendWebsiteCrons --externalApp " + items.externalApp
cronOutput = ProcessUtilities.outputExecutioner(execPath, items.externalApp)
CronUtil.CronPrem(0)
if cronOutput.find("1,") > -1:
logging.CyberCPLogFileWriter.writeToFile(f"Successfully suspended cron jobs for child domain {items.domain}")
else:
logging.CyberCPLogFileWriter.writeToFile(f"Warning: Failed to suspend cron jobs for child domain {items.domain}: {cronOutput}")
except Exception as e:
CronUtil.CronPrem(0) # Ensure permissions are restored
logging.CyberCPLogFileWriter.writeToFile(f"Error suspending cron jobs for child domain {items.domain}: {str(e)}")
# Apply same suspension configuration to child domains
for items in childDomains:
childConfPath = virtualHostUtilities.Server_root + "/conf/vhosts/" + items.domain
childVhostConfPath = childConfPath + "/vhost.conf"
@@ -3198,6 +3216,22 @@ context /cyberpanel_suspension_page.html {
except Exception as e:
CyberCPLogFileWriter.writeToFile(f"Error suspending child domain {items.domain}: {str(e)}")
# Suspend cron jobs for this website
try:
CronUtil.CronPrem(1)
execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/cronUtil.py"
execPath = execPath + " suspendWebsiteCrons --externalApp " + website.externalApp
cronOutput = ProcessUtilities.outputExecutioner(execPath, website.externalApp)
CronUtil.CronPrem(0)
if cronOutput.find("1,") > -1:
logging.CyberCPLogFileWriter.writeToFile(f"Successfully suspended cron jobs for {websiteName}")
else:
logging.CyberCPLogFileWriter.writeToFile(f"Warning: Failed to suspend cron jobs for {websiteName}: {cronOutput}")
except Exception as e:
CronUtil.CronPrem(0) # Ensure permissions are restored
logging.CyberCPLogFileWriter.writeToFile(f"Error suspending cron jobs for {websiteName}: {str(e)}")
# Restart LiteSpeed to apply changes
try:
installUtilities.reStartLiteSpeedSocket()
@@ -3297,9 +3331,27 @@ context /cyberpanel_suspension_page.html {
except:
pass
# Remove suspension configuration from child domains
# Restore cron jobs for child domains
childDomains = website.childdomains_set.all()
for items in childDomains:
# Restore cron jobs for child domain
try:
CronUtil.CronPrem(1)
execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/cronUtil.py"
execPath = execPath + " restoreWebsiteCrons --externalApp " + items.externalApp
cronOutput = ProcessUtilities.outputExecutioner(execPath, items.externalApp)
CronUtil.CronPrem(0)
if cronOutput.find("1,") > -1:
logging.CyberCPLogFileWriter.writeToFile(f"Successfully restored cron jobs for child domain {items.domain}")
else:
logging.CyberCPLogFileWriter.writeToFile(f"Info: {cronOutput} for child domain {items.domain}")
except Exception as e:
CronUtil.CronPrem(0) # Ensure permissions are restored
logging.CyberCPLogFileWriter.writeToFile(f"Error restoring cron jobs for child domain {items.domain}: {str(e)}")
# Remove suspension configuration from child domains
for items in childDomains:
childConfPath = virtualHostUtilities.Server_root + "/conf/vhosts/" + items.domain
childVhostConfPath = childConfPath + "/vhost.conf"
@@ -3346,6 +3398,22 @@ context /cyberpanel_suspension_page.html {
except Exception as e:
CyberCPLogFileWriter.writeToFile(f"Error unsuspending child domain {items.domain}: {str(e)}")
# Restore cron jobs for this website
try:
CronUtil.CronPrem(1)
execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/cronUtil.py"
execPath = execPath + " restoreWebsiteCrons --externalApp " + website.externalApp
cronOutput = ProcessUtilities.outputExecutioner(execPath, website.externalApp)
CronUtil.CronPrem(0)
if cronOutput.find("1,") > -1:
logging.CyberCPLogFileWriter.writeToFile(f"Successfully restored cron jobs for {websiteName}")
else:
logging.CyberCPLogFileWriter.writeToFile(f"Info: {cronOutput} for {websiteName}")
except Exception as e:
CronUtil.CronPrem(0) # Ensure permissions are restored
logging.CyberCPLogFileWriter.writeToFile(f"Error restoring cron jobs for {websiteName}: {str(e)}")
# Restart LiteSpeed to apply changes
try:
installUtilities.reStartLiteSpeedSocket()