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

bug fix: n8n reporting

Browse Source
This commit is contained in:
usmannasir
2025-04-10 20:04:49 +05:00
parent 20eabc7ccf
commit 52a416201c
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plogical/DockerSites.py
View File

@@ -956,13 +956,17 @@ services:
# Check container health # Check container health
command = f"docker ps -a --filter name={self.data['ServiceName']} --format '{{{{.Status}}}}'" command = f"docker ps -a --filter name={self.data['ServiceName']} --format '{{{{.Status}}}}'"
status = ProcessUtilities.outputExecutioner(command, None, None, None, 1) result, status = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
if "unhealthy" in status or "exited" in status: if result == 0:
raise DockerDeploymentError(f"Failed to check container status: {status}")
# Accept unhealthy status as well
if "exited" in status:
# Get container logs # Get container logs
command = f"docker logs {n8n_container_name}" command = f"docker logs {n8n_container_name}"
logs = ProcessUtilities.outputExecutioner(command, None, None, None, 1) result, logs = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
raise DockerDeploymentError(f"Container unhealthy or exited. Logs: {logs}") raise DockerDeploymentError(f"Container exited. Logs: {logs}")
# Wait for database to be ready # Wait for database to be ready
max_retries = 30 max_retries = 30
@@ -972,17 +976,17 @@ services:
while retry_count < max_retries: while retry_count < max_retries:
# Check if database container is ready # Check if database container is ready
command = f"docker exec {db_container_name} pg_isready -U postgres" command = f"docker exec {db_container_name} pg_isready -U postgres"
result = ProcessUtilities.outputExecutioner(command, None, None, None, 1) result, output = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
if "accepting connections" in result: if result == 0 and "accepting connections" in output:
db_ready = True db_ready = True
break break
# Check container status # Check container status
command = f"docker inspect --format='{{{{.State.Status}}}}' {db_container_name}" command = f"docker inspect --format='{{{{.State.Status}}}}' {db_container_name}"
db_status = ProcessUtilities.outputExecutioner(command, None, None, None, 1).strip() result, db_status = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
if db_status not in ['running', 'starting']: if result == 0 and db_status not in ['running', 'starting', 'unhealthy']:
raise DockerDeploymentError(f"Database container is in {db_status} state") raise DockerDeploymentError(f"Database container is in {db_status} state")
retry_count += 1 retry_count += 1
@@ -994,10 +998,10 @@ services:
# Verify database connection from n8n container # Verify database connection from n8n container
command = f"docker exec {n8n_container_name} node -e \"const pg = require('pg'); const client = new pg.Client({{ user: 'postgres', password: '{self.data['MySQLPassword']}', host: '{self.data['ServiceName']}-db', port: 5432, database: '{self.data['MySQLDBName']}' }}); client.connect().then(() => {{ console.log('Connected successfully'); process.exit(0); }}).catch(err => {{ console.error(err); process.exit(1); }});\"" command = f"docker exec {n8n_container_name} node -e \"const pg = require('pg'); const client = new pg.Client({{ user: 'postgres', password: '{self.data['MySQLPassword']}', host: '{self.data['ServiceName']}-db', port: 5432, database: '{self.data['MySQLDBName']}' }}); client.connect().then(() => {{ console.log('Connected successfully'); process.exit(0); }}).catch(err => {{ console.error(err); process.exit(1); }});\""
result = ProcessUtilities.outputExecutioner(command, None, None, None, 1) result, output = ProcessUtilities.outputExecutioner(command, None, None, None, 1)
if "Connected successfully" not in result: if result != 0 or "Connected successfully" not in output:
raise DockerDeploymentError(f"Failed to verify database connection: {result}") raise DockerDeploymentError(f"Failed to verify database connection: {output}")
return True return True