Max/zkldi_Tachi
1
0
Fork 0
mirror of https://github.com/zkldi/Tachi.git synced 2026-10-13 17:58:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v2.1.10' into develop

Browse Source
This commit is contained in:
zkldi
2022-03-24 16:11:08 +00:00
parent 6eee59f7d5 1002adcd03
commit d9f948a7bf
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/CHANGELOG.md
+4
View File
@@ -15,6 +15,10 @@ not generally be shown to end users.
# Changelog
# 2.1.10
- [BUG] Users can no longer permanently lock themselves out of an import by making an import while one is ongoing.
# 2.1.9
- [ENH] Add an endpoint on UGPT/folder/:folderID/stats. This returns lamp and grade distributions for this ugpt:folder combo.
server/src/lib/score-import/framework/score-importing/score-import-main.ts
+13 -13
View File
@@ -64,20 +64,20 @@ export default async function ScoreImportMain<D, C>(
logger = providedLogger;
}
const hasNoOngoingImport = await CheckAndSetOngoingImportLock(user.id);
if (hasNoOngoingImport) {
logger.info(`User ${userID} made an import while they had one ongoing.`);
// @danger
// Throwing away an import if the user already has one outgoing is *bad*, as in the case
// of degraded performance we might just start throwing scores away.
// Under normal circumstances, there is no scenario where a user would have two ongoing
// imports at the same time - even if they were using single-score imports on a 5 second
// chart, as each score import takes only around ~10-15milliseconds.
throw new ScoreImportFatalError(409, "This user already has an ongoing import.");
}
try {
const hasNoOngoingImport = await CheckAndSetOngoingImportLock(user.id);
if (hasNoOngoingImport) {
logger.info(`User ${userID} made an import while they had one ongoing.`);
// @danger
// Throwing away an import if the user already has one outgoing is *bad*, as in the case
// of degraded performance we might just start throwing scores away.
// Under normal circumstances, there is no scenario where a user would have two ongoing
// imports at the same time - even if they were using single-score imports on a 5 second
// chart, as each score import takes only around ~10-15milliseconds.
throw new ScoreImportFatalError(409, "This user already has an ongoing import.");
}
const timeStarted = Date.now();
SetJobProgress(job, "Parsing score data.");