salman/igny8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable webhook container restart

Browse Source
This commit is contained in:
IGNY8 VPS (Salman)
2025-12-15 07:53:00 +00:00
parent 41551f2edc
commit f8c6dfe889
2 changed files with 87 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
backend/igny8_core/modules/system/views.py
View File

@@ -670,83 +670,87 @@ def gitea_webhook(request):
deployment_success = False deployment_success = False
deployment_error = None deployment_error = None
try: # COMMENTED OUT: Container restart disabled to prevent auto-restart on git commits
# Try to use docker Python library first, fallback to subprocess logger.info(f"[Webhook] Container restart is DISABLED - code updated but containers not restarted")
try: deployment_success = True
import docker as docker_lib
client = docker_lib.DockerClient(base_url='unix://var/run/docker.sock') # try:
# # Try to use docker Python library first, fallback to subprocess
# Restart frontend container (don't restart backend from within itself) # try:
logger.info(f"[Webhook] Restarting frontend container...") # import docker as docker_lib
frontend_container = client.containers.get("igny8_frontend") # client = docker_lib.DockerClient(base_url='unix://var/run/docker.sock')
frontend_container.restart(timeout=30) #
logger.info(f"[Webhook] Frontend container restarted successfully") # # Restart frontend container (don't restart backend from within itself)
# logger.info(f"[Webhook] Restarting frontend container...")
# Schedule backend restart via subprocess in background (non-blocking) # frontend_container = client.containers.get("igny8_frontend")
# This avoids deadlock from restarting the container we're running in # frontend_container.restart(timeout=30)
logger.info(f"[Webhook] Scheduling backend container restart...") # logger.info(f"[Webhook] Frontend container restarted successfully")
import threading #
def restart_backend(): # # Schedule backend restart via subprocess in background (non-blocking)
import time # # This avoids deadlock from restarting the container we're running in
time.sleep(2) # Give webhook time to respond # logger.info(f"[Webhook] Scheduling backend container restart...")
try: # import threading
backend_container = client.containers.get("igny8_backend") # def restart_backend():
backend_container.restart(timeout=30) # import time
logger.info(f"[Webhook] Backend container restarted successfully (delayed)") # time.sleep(2) # Give webhook time to respond
except Exception as e: # try:
logger.error(f"[Webhook] Delayed backend restart failed: {e}") # backend_container = client.containers.get("igny8_backend")
# backend_container.restart(timeout=30)
restart_thread = threading.Thread(target=restart_backend, daemon=True) # logger.info(f"[Webhook] Backend container restarted successfully (delayed)")
restart_thread.start() # except Exception as e:
# logger.error(f"[Webhook] Delayed backend restart failed: {e}")
deployment_success = True #
# restart_thread = threading.Thread(target=restart_backend, daemon=True)
except ImportError: # restart_thread.start()
# Fallback to subprocess with docker command #
logger.info(f"[Webhook] Docker library not available, using subprocess...") # deployment_success = True
#
# Try /usr/bin/docker or docker in PATH # except ImportError:
docker_cmd = "/usr/bin/docker" # # Fallback to subprocess with docker command
import shutil # logger.info(f"[Webhook] Docker library not available, using subprocess...")
if not os.path.exists(docker_cmd): #
docker_cmd = shutil.which("docker") or "docker" # # Try /usr/bin/docker or docker in PATH
# docker_cmd = "/usr/bin/docker"
# Restart backend container # import shutil
logger.info(f"[Webhook] Restarting backend container...") # if not os.path.exists(docker_cmd):
backend_result = subprocess.run( # docker_cmd = shutil.which("docker") or "docker"
[docker_cmd, "restart", "igny8_backend"], #
capture_output=True, # # Restart backend container
text=True, # logger.info(f"[Webhook] Restarting backend container...")
timeout=30 # backend_result = subprocess.run(
) # [docker_cmd, "restart", "igny8_backend"],
# capture_output=True,
if backend_result.returncode != 0: # text=True,
raise Exception(f"Backend restart failed: {backend_result.stderr}") # timeout=30
logger.info(f"[Webhook] Backend container restarted successfully") # )
#
# Restart frontend container # if backend_result.returncode != 0:
logger.info(f"[Webhook] Restarting frontend container...") # raise Exception(f"Backend restart failed: {backend_result.stderr}")
frontend_result = subprocess.run( # logger.info(f"[Webhook] Backend container restarted successfully")
[docker_cmd, "restart", "igny8_frontend"], #
capture_output=True, # # Restart frontend container
text=True, # logger.info(f"[Webhook] Restarting frontend container...")
timeout=30 # frontend_result = subprocess.run(
) # [docker_cmd, "restart", "igny8_frontend"],
# capture_output=True,
if frontend_result.returncode != 0: # text=True,
raise Exception(f"Frontend restart failed: {frontend_result.stderr}") # timeout=30
logger.info(f"[Webhook] Frontend container restarted successfully") # )
#
deployment_success = True # if frontend_result.returncode != 0:
# raise Exception(f"Frontend restart failed: {frontend_result.stderr}")
logger.info(f"[Webhook] Deployment completed: containers restarted") # logger.info(f"[Webhook] Frontend container restarted successfully")
#
except subprocess.TimeoutExpired as e: # deployment_success = True
deployment_error = f"Deployment timeout: {str(e)}" #
logger.error(f"[Webhook] {deployment_error}") # logger.info(f"[Webhook] Deployment completed: containers restarted")
except Exception as deploy_error: #
deployment_error = str(deploy_error) # except subprocess.TimeoutExpired as e:
logger.error(f"[Webhook] Deployment error: {deploy_error}", exc_info=True) # deployment_error = f"Deployment timeout: {str(e)}"
# logger.error(f"[Webhook] {deployment_error}")
# except Exception as deploy_error:
# deployment_error = str(deploy_error)
# logger.error(f"[Webhook] Deployment error: {deploy_error}", exc_info=True)
return success_response( return success_response(
data={ data={

6
frontend/vite.config.ts
View File

@@ -197,6 +197,12 @@ export default defineConfig(({ mode, command }) => {
'**/build/**', '**/build/**',
'**/.vscode/**', '**/.vscode/**',
'**/.idea/**', '**/.idea/**',
'**/Dockerfile*', // Ignore all Dockerfiles
'**/Caddyfile*', // Ignore Caddyfiles
'**/*.md', // Ignore markdown files
'**/container_startup.sh', // Ignore startup script
'**/.dockerignore',
'**/.gitignore',
], ],
interval: 1000, // Poll every 1 second (default is 100ms) interval: 1000, // Poll every 1 second (default is 100ms)
}, },