diff --git a/server/managers/LogManager.js b/server/managers/LogManager.js index 756070365..5583c5dfd 100644 --- a/server/managers/LogManager.js +++ b/server/managers/LogManager.js @@ -36,6 +36,10 @@ class LogManager { return global.ServerSettings.loggerDailyLogsToKeep || 7 } + get loggerScannerLogsToKeep() { + return global.ServerSettings.loggerScannerLogsToKeep || 2 + } + async enforceDailyLogRetention() { while (this.dailyLogFiles.length > this.loggerDailyLogsToKeep) { await this.removeLogFile(this.dailyLogFiles[0]) @@ -184,5 +188,37 @@ class LogManager { getMostRecentCurrentDailyLogs() { return this.currentDailyLog?.logs.slice(-5000) || '' } + + /** + * Keep the most recent N scan logs in metadata/logs/scans. + * Where N is the server setting `loggerScannerLogsToKeep`. + * + * @param {string} [logDir] + */ + async purgeOldScanLogs(logDir = this.ScanLogPath) { + const scanLogsToKeep = this.loggerScannerLogsToKeep + + let scanFiles + try { + scanFiles = await fs.readdir(logDir) + } catch (error) { + Logger.warn(TAG, `Failed to read scan log dir "${logDir}": ${error.message}`) + return + } + + const scanLogFiles = (scanFiles || []).filter((f) => Path.extname(f) === '.txt').sort() + if (scanLogFiles.length <= scanLogsToKeep) return + + const filesToRemove = scanLogFiles.slice(0, scanLogFiles.length - scanLogsToKeep) + for (const file of filesToRemove) { + const fullPath = Path.join(logDir, file) + try { + await fs.unlink(fullPath) + Logger.info(TAG, `Removed scan log "${fullPath}"`) + } catch (error) { + Logger.warn(TAG, `Failed to remove scan log "${fullPath}": ${error.message}`) + } + } + } } module.exports = LogManager diff --git a/server/scanner/LibraryScan.js b/server/scanner/LibraryScan.js index 75a998304..4f9044162 100644 --- a/server/scanner/LibraryScan.js +++ b/server/scanner/LibraryScan.js @@ -30,10 +30,6 @@ class LibraryScan { this.logs = [] } - get loggerScannerLogsToKeep() { - return global.ServerSettings?.loggerScannerLogsToKeep || 2 - } - get libraryId() { return this.library.id } @@ -127,9 +123,7 @@ class LibraryScan { } async saveLog() { - const scanLogDir = Path.join(global.MetadataPath, 'logs', 'scans') - - await fs.ensureDir(scanLogDir) + const scanLogDir = Logger.logManager.ScanLogPath const outputPath = Path.join(scanLogDir, this.logFilename) const logLines = [JSON.stringify(this.toJSON())] @@ -140,39 +134,7 @@ class LibraryScan { Logger.info(`[LibraryScan] Scan log saved "${outputPath}"`) - await this.purgeOldScanLogs(scanLogDir) - } - - /** - * Keep the most recent N scan logs in metadata/logs/scans. - * Where N is the server setting `loggerScannerLogsToKeep`. - * - * @param {string} scanLogDir - */ - async purgeOldScanLogs(scanLogDir) { - const scanLogsToKeep = this.loggerScannerLogsToKeep - - let scanFiles - try { - scanFiles = await fs.readdir(scanLogDir) - } catch (error) { - Logger.warn(`[LibraryScan] Failed to read scan log dir "${scanLogDir}": ${error.message}`) - return - } - - const scanLogFiles = (scanFiles || []).filter((f) => Path.extname(f) === '.txt').sort() - if (scanLogFiles.length <= scanLogsToKeep) return - - const filesToRemove = scanLogFiles.slice(0, scanLogFiles.length - scanLogsToKeep) - for (const file of filesToRemove) { - const fullPath = Path.join(scanLogDir, file) - try { - await fs.unlink(fullPath) - Logger.info(`[LibraryScan] Removed scan log "${fullPath}"`) - } catch (error) { - Logger.warn(`[LibraryScan] Failed to remove scan log "${fullPath}": ${error.message}`) - } - } + await Logger.logManager?.purgeOldScanLogs() } } module.exports = LibraryScan