diff --git a/packages/server/src/utils/backups/compose.ts b/packages/server/src/utils/backups/compose.ts index 296498ff37..e3335ac02f 100644 --- a/packages/server/src/utils/backups/compose.ts +++ b/packages/server/src/utils/backups/compose.ts @@ -63,7 +63,10 @@ export const runComposeBackup = async ( await updateDeploymentStatus(deployment.deploymentId, "done"); } catch (error) { - console.log(error); + console.error( + "Compose backup failed:", + error instanceof Error ? error.message : "Unknown error", + ); await sendDatabaseBackupNotifications({ applicationName: name, projectName: project.name, diff --git a/packages/server/src/utils/backups/index.ts b/packages/server/src/utils/backups/index.ts index 8f0e0b6dd9..f5597ec156 100644 --- a/packages/server/src/utils/backups/index.ts +++ b/packages/server/src/utils/backups/index.ts @@ -13,6 +13,7 @@ import { sendDockerCleanupNotifications } from "../notifications/docker-cleanup" import { execAsync, execAsyncRemote } from "../process/execAsync"; import { getS3Credentials, normalizeS3Path, scheduleBackup } from "./utils"; + export const initCronJobs = async () => { console.log("Setting up cron jobs...."); @@ -153,6 +154,9 @@ export const keepLatestNBackups = async ( await execAsync(rcloneCommand); } } catch (error) { - console.error(error); + console.error( + "Failed to cleanup old backups:", + error instanceof Error ? error.message : "Unknown error", + ); } }; diff --git a/packages/server/src/utils/backups/mariadb.ts b/packages/server/src/utils/backups/mariadb.ts index 121910ee80..9dd11461ff 100644 --- a/packages/server/src/utils/backups/mariadb.ts +++ b/packages/server/src/utils/backups/mariadb.ts @@ -60,7 +60,10 @@ export const runMariadbBackup = async ( }); await updateDeploymentStatus(deployment.deploymentId, "done"); } catch (error) { - console.log(error); + console.error( + "MariaDB backup failed:", + error instanceof Error ? error.message : "Unknown error", + ); await sendDatabaseBackupNotifications({ applicationName: name, projectName: project.name, diff --git a/packages/server/src/utils/backups/mongo.ts b/packages/server/src/utils/backups/mongo.ts index 4b212d70c1..27912765bd 100644 --- a/packages/server/src/utils/backups/mongo.ts +++ b/packages/server/src/utils/backups/mongo.ts @@ -58,7 +58,10 @@ export const runMongoBackup = async (mongo: Mongo, backup: BackupSchedule) => { }); await updateDeploymentStatus(deployment.deploymentId, "done"); } catch (error) { - console.log(error); + console.error( + "MongoDB backup failed:", + error instanceof Error ? error.message : "Unknown error", + ); await sendDatabaseBackupNotifications({ applicationName: name, projectName: project.name, diff --git a/packages/server/src/utils/backups/mysql.ts b/packages/server/src/utils/backups/mysql.ts index 8d0e6188a0..a4cccb3600 100644 --- a/packages/server/src/utils/backups/mysql.ts +++ b/packages/server/src/utils/backups/mysql.ts @@ -59,7 +59,10 @@ export const runMySqlBackup = async (mysql: MySql, backup: BackupSchedule) => { }); await updateDeploymentStatus(deployment.deploymentId, "done"); } catch (error) { - console.log(error); + console.error( + "MySQL backup failed:", + error instanceof Error ? error.message : "Unknown error", + ); await sendDatabaseBackupNotifications({ applicationName: name, projectName: project.name, diff --git a/packages/server/src/utils/backups/utils.ts b/packages/server/src/utils/backups/utils.ts index 365ebff415..8986aef33f 100644 --- a/packages/server/src/utils/backups/utils.ts +++ b/packages/server/src/utils/backups/utils.ts @@ -260,10 +260,8 @@ export const getBackupCommand = ( logger.info( { - containerSearch, - backupCommand, - rcloneCommand, - logPath, + + logPath }, `Executing backup command: ${backup.databaseType} ${backup.backupType}`, ); diff --git a/packages/server/src/utils/backups/web-server.ts b/packages/server/src/utils/backups/web-server.ts index 712cc08090..bf933b688d 100644 --- a/packages/server/src/utils/backups/web-server.ts +++ b/packages/server/src/utils/backups/web-server.ts @@ -113,11 +113,19 @@ export const runWebServerBackup = async (backup: BackupSchedule) => { try { await rm(tempDir, { recursive: true, force: true }); } catch (cleanupError) { - console.error("Cleanup error:", cleanupError); + console.error( + "Cleanup error:", + cleanupError instanceof Error + ? cleanupError.message + : "Unknown error", + ); } } } catch (error) { - console.error("Backup error:", error); + console.error( + "Backup error:", + error instanceof Error ? error.message : "Unknown error", + ); writeStream.write("Backup errorāŒ\n"); writeStream.write( error instanceof Error ? error.message : "Unknown error\n",