danvics/zerobyte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: include schedule name in backup notifications and logs

Browse source
This commit is contained in:
Jakub Trávník 2025-12-22 11:52:39 +01:00 committed by Nico
parent c05aa8d5bf
commit 45187ba09d
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/server/modules/backups/backups.service.ts
View file

@ -236,7 +236,7 @@ const executeBackup = async (scheduleId: number, manual = false) => {
throw new BadRequestError("Volume is not mounted"); throw new BadRequestError("Volume is not mounted");
} }
logger.info(`Starting backup for volume ${volume.name} to repository ${repository.name}`); logger.info(`Starting backup ${schedule.name} for volume ${volume.name} to repository ${repository.name}`);
serverEvents.emit("backup:started", { serverEvents.emit("backup:started", {
scheduleId, scheduleId,
@ -248,6 +248,7 @@ const executeBackup = async (scheduleId: number, manual = false) => {
.sendBackupNotification(scheduleId, "start", { .sendBackupNotification(scheduleId, "start", {
volumeName: volume.name, volumeName: volume.name,
repositoryName: repository.name, repositoryName: repository.name,
scheduleName: schedule.name,
}) })
.catch((error) => { .catch((error) => {
logger.error(`Failed to send backup start notification: ${toMessage(error)}`); logger.error(`Failed to send backup start notification: ${toMessage(error)}`);
@ -341,9 +342,9 @@ const executeBackup = async (scheduleId: number, manual = false) => {
.where(eq(backupSchedulesTable.id, scheduleId)); .where(eq(backupSchedulesTable.id, scheduleId));
if (finalStatus === "warning") { if (finalStatus === "warning") {
logger.warn(`Backup completed with warnings for volume ${volume.name} to repository ${repository.name}`); logger.warn(`Backup ${schedule.name} completed with warnings for volume ${volume.name} to repository ${repository.name}`);
} else { } else {
logger.info(`Backup completed successfully for volume ${volume.name} to repository ${repository.name}`); logger.info(`Backup ${schedule.name} completed successfully for volume ${volume.name} to repository ${repository.name}`);
} }
serverEvents.emit("backup:completed", { serverEvents.emit("backup:completed", {
@ -357,12 +358,13 @@ const executeBackup = async (scheduleId: number, manual = false) => {
.sendBackupNotification(scheduleId, finalStatus === "success" ? "success" : "warning", { .sendBackupNotification(scheduleId, finalStatus === "success" ? "success" : "warning", {
volumeName: volume.name, volumeName: volume.name,
repositoryName: repository.name, repositoryName: repository.name,
scheduleName: schedule.name,
}) })
.catch((error) => { .catch((error) => {
logger.error(`Failed to send backup success notification: ${toMessage(error)}`); logger.error(`Failed to send backup success notification: ${toMessage(error)}`);
}); });
} catch (error) { } catch (error) {
logger.error(`Backup failed for volume ${volume.name} to repository ${repository.name}: ${toMessage(error)}`); logger.error(`Backup ${schedule.name} failed for volume ${volume.name} to repository ${repository.name}: ${toMessage(error)}`);
await db await db
.update(backupSchedulesTable) .update(backupSchedulesTable)
@ -385,6 +387,7 @@ const executeBackup = async (scheduleId: number, manual = false) => {
.sendBackupNotification(scheduleId, "failure", { .sendBackupNotification(scheduleId, "failure", {
volumeName: volume.name, volumeName: volume.name,
repositoryName: repository.name, repositoryName: repository.name,
scheduleName: schedule.name,
error: toMessage(error), error: toMessage(error),
}) })
.catch((notifError) => { .catch((notifError) => {

12
app/server/modules/notifications/notifications.service.ts
View file

@ -388,6 +388,7 @@ function buildNotificationMessage(
body: [ body: [
`Volume: ${context.volumeName}`, `Volume: ${context.volumeName}`,
`Repository: ${context.repositoryName}`, `Repository: ${context.repositoryName}`,
context.scheduleName ? `Schedule: ${context.scheduleName}` : null,
context.duration ? `Duration: ${Math.round(context.duration / 1000)}s` : null, context.duration ? `Duration: ${Math.round(context.duration / 1000)}s` : null,
context.filesProcessed !== undefined ? `Files: ${context.filesProcessed}` : null, context.filesProcessed !== undefined ? `Files: ${context.filesProcessed}` : null,
context.bytesProcessed ? `Size: ${context.bytesProcessed}` : null, context.bytesProcessed ? `Size: ${context.bytesProcessed}` : null,
@ -404,6 +405,7 @@ function buildNotificationMessage(
body: [ body: [
`Volume: ${context.volumeName}`, `Volume: ${context.volumeName}`,
`Repository: ${context.repositoryName}`, `Repository: ${context.repositoryName}`,
context.scheduleName ? `Schedule: ${context.scheduleName}` : null,
context.duration ? `Duration: ${Math.round(context.duration / 1000)}s` : null, context.duration ? `Duration: ${Math.round(context.duration / 1000)}s` : null,
context.filesProcessed !== undefined ? `Files: ${context.filesProcessed}` : null, context.filesProcessed !== undefined ? `Files: ${context.filesProcessed}` : null,
context.bytesProcessed ? `Size: ${context.bytesProcessed}` : null, context.bytesProcessed ? `Size: ${context.bytesProcessed}` : null,
@ -421,6 +423,7 @@ function buildNotificationMessage(
body: [ body: [
`Volume: ${context.volumeName}`, `Volume: ${context.volumeName}`,
`Repository: ${context.repositoryName}`, `Repository: ${context.repositoryName}`,
context.scheduleName ? `Schedule: ${context.scheduleName}` : null,
context.error ? `Error: ${context.error}` : null, context.error ? `Error: ${context.error}` : null,
`Time: ${date} - ${time}`, `Time: ${date} - ${time}`,
] ]
@ -431,7 +434,14 @@ function buildNotificationMessage(
default: default:
return { return {
title: "Backup Notification", title: "Backup Notification",
body: `Volume: ${context.volumeName}\nRepository: ${context.repositoryName}\nTime: ${date} - ${time}`, body: [
`Volume: ${context.volumeName}`,
`Repository: ${context.repositoryName}`,
context.scheduleName ? `Schedule: ${context.scheduleName}` : null,
`Time: ${date} - ${time}`,
]
.filter(Boolean)
.join("\n"),
}; };
} }
} }