Bluemedia/muse
1
0
Fork 0
mirror of https://github.com/BluemediaGER/muse.git synced 2024-11-23 09:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use loop instead of recursion

Browse source
This commit is contained in:
Max Isom 2021-12-03 11:06:56 -05:00
parent 4ffd679ddb
commit 7ff54b9495
No known key found for this signature in database
GPG key ID: 25C9B1A7F6798880
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/services/file-cache.ts
View file

@ -94,13 +94,12 @@ export default class FileCacheProvider {
private async evictOldest() { private async evictOldest() {
debug('Evicting oldest files...'); debug('Evicting oldest files...');
const [{dataValues: {totalSizeBytes}}] = await FileCache.findAll({
attributes: [
[sequelize.fn('sum', sequelize.col('bytes')), 'totalSizeBytes'],
],
}) as unknown as [{dataValues: {totalSizeBytes: number}}];
if (totalSizeBytes > this.config.CACHE_LIMIT_IN_BYTES) { let totalSizeBytes = await this.getDiskUsageInBytes();
let numOfEvictedFiles = 0;
// Continue to evict until we're under the limit
/* eslint-disable no-await-in-loop */
while (totalSizeBytes > this.config.CACHE_LIMIT_IN_BYTES) {
const oldest = await FileCache.findOne({ const oldest = await FileCache.findOne({
order: [ order: [
['accessedAt', 'ASC'], ['accessedAt', 'ASC'],
@ -111,10 +110,15 @@ export default class FileCacheProvider {
await oldest.destroy(); await oldest.destroy();
await fs.unlink(path.join(this.config.CACHE_DIR, oldest.hash)); await fs.unlink(path.join(this.config.CACHE_DIR, oldest.hash));
debug(`${oldest.hash} has been evicted`); debug(`${oldest.hash} has been evicted`);
numOfEvictedFiles++;
} }
// Continue to evict until we're under the limit totalSizeBytes = await this.getDiskUsageInBytes();
void this.evictionQueue.add(this.evictOldest.bind(this)); }
/* eslint-enable no-await-in-loop */
if (numOfEvictedFiles > 0) {
debug(`${numOfEvictedFiles} files have been evicted`);
} else { } else {
debug(`No files needed to be evicted. Total size of the cache is currently ${totalSizeBytes} bytes, and the cache limit is ${this.config.CACHE_LIMIT_IN_BYTES} bytes.`); debug(`No files needed to be evicted. Total size of the cache is currently ${totalSizeBytes} bytes, and the cache limit is ${this.config.CACHE_LIMIT_IN_BYTES} bytes.`);
} }
@ -131,4 +135,19 @@ export default class FileCacheProvider {
} }
} }
} }
/**
* Pulls from the database rather than the filesystem,
* so may be slightly inaccurate.
* @returns the total size of the cache in bytes
*/
private async getDiskUsageInBytes() {
const [{dataValues: {totalSizeBytes}}] = await FileCache.findAll({
attributes: [
[sequelize.fn('sum', sequelize.col('bytes')), 'totalSizeBytes'],
],
}) as unknown as [{dataValues: {totalSizeBytes: number}}];
return totalSizeBytes;
}
} }