D4282.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D4282.diff
View Options

	diff --git a/keyserver/src/cron/backups.js b/keyserver/src/cron/backups.js
	--- a/keyserver/src/cron/backups.js
	+++ b/keyserver/src/cron/backups.js
	@@ -194,19 +194,19 @@
	}

	async function deleteOldestBackup() {
	- const [backupConfig, backupInfos] = await Promise.all([
	- getBackupConfig(),
	- getSortedBackupInfos(),
	- ]);
	-
	- invariant(backupConfig, 'backupConfig should be non-null');
	- if (backupInfos.length === 0) {
	+ const sortedBackupInfos = await getSortedBackupInfos();
	+ if (sortedBackupInfos.length === 0) {
	throw new Error('no_backups_left');
	}
	+ const oldestFilename = sortedBackupInfos[0].filename;
	+ await deleteBackup(oldestFilename);
	+}

	- const oldestFilename = backupInfos[0].filename;
	+async function deleteBackup(filename: string) {
	+ const backupConfig = await getBackupConfig();
	+ invariant(backupConfig, 'backupConfig should be non-null');
	try {
	- await unlink(`${backupConfig.directory}/${oldestFilename}`);
	+ await unlink(`${backupConfig.directory}/${filename}`);
	} catch (e) {
	// Check if it's already been deleted
	if (e.code !== 'ENOENT') {