From d9a7b1248ab5b7d7cce8044f648b38ec46cef2a7 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 17 Apr 2018 14:43:54 +0100 Subject: [PATCH] Re-order compile rate limits to do project/user check before everyone check --- .../Features/Compile/CompileManager.coffee | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/services/web/app/coffee/Features/Compile/CompileManager.coffee b/services/web/app/coffee/Features/Compile/CompileManager.coffee index 3022a214c4..4f4fe89e94 100755 --- a/services/web/app/coffee/Features/Compile/CompileManager.coffee +++ b/services/web/app/coffee/Features/Compile/CompileManager.coffee @@ -18,15 +18,16 @@ module.exports = CompileManager = timer.done() _callback(args...) - @_checkIfAutoCompileLimitHasBeenHit options.isAutoCompile, "everyone", (err, canCompile)-> - if !canCompile - return callback null, "autocompile-backoff", [] - logger.log project_id: project_id, user_id: user_id, "compiling project" - CompileManager._checkIfRecentlyCompiled project_id, user_id, (error, recentlyCompiled) -> - return callback(error) if error? - if recentlyCompiled - logger.warn {project_id, user_id}, "project was recently compiled so not continuing" - return callback null, "too-recently-compiled", [] + logger.log project_id: project_id, user_id: user_id, "compiling project" + CompileManager._checkIfRecentlyCompiled project_id, user_id, (error, recentlyCompiled) -> + return callback(error) if error? + if recentlyCompiled + logger.warn {project_id, user_id}, "project was recently compiled so not continuing" + return callback null, "too-recently-compiled", [] + + CompileManager._checkIfAutoCompileLimitHasBeenHit options.isAutoCompile, "everyone", (err, canCompile)-> + if !canCompile + return callback null, "autocompile-backoff", [] CompileManager._ensureRootDocumentIsSet project_id, (error) -> return callback(error) if error?