Craftadoc/clsi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #110 from sharelatex/ho-increase-compile-size

Browse Source 
pull clsi compile size limit into setting and bump to 7mb
This commit is contained in:
Henry Oswald
2019-01-08 13:30:00 +00:00
committed by GitHub
parent ee7947f54d 541dac11cb
commit 6fbdcd76d0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.coffee
View File

@@ -58,7 +58,7 @@ app.param 'build_id', (req, res, next, build_id) ->
next new Error("invalid build id #{build_id}") next new Error("invalid build id #{build_id}")
app.post "/project/:project_id/compile", bodyParser.json(limit: "5mb"), CompileController.compile app.post "/project/:project_id/compile", bodyParser.json(limit: Settings.compileSizeLimit), CompileController.compile
app.post "/project/:project_id/compile/stop", CompileController.stopCompile app.post "/project/:project_id/compile/stop", CompileController.stopCompile
app.delete "/project/:project_id", CompileController.clearCache app.delete "/project/:project_id", CompileController.clearCache
@@ -68,7 +68,7 @@ app.get "/project/:project_id/wordcount", CompileController.wordcount
app.get "/project/:project_id/status", CompileController.status app.get "/project/:project_id/status", CompileController.status
# Per-user containers # Per-user containers
app.post "/project/:project_id/user/:user_id/compile", bodyParser.json(limit: "5mb"), CompileController.compile app.post "/project/:project_id/user/:user_id/compile", bodyParser.json(limit: Settings.compileSizeLimit), CompileController.compile
app.post "/project/:project_id/user/:user_id/compile/stop", CompileController.stopCompile app.post "/project/:project_id/user/:user_id/compile/stop", CompileController.stopCompile
app.delete "/project/:project_id/user/:user_id", CompileController.clearCache app.delete "/project/:project_id/user/:user_id", CompileController.clearCache

3
config/settings.defaults.coffee
View File

@@ -15,6 +15,8 @@ module.exports =
retry: retry:
max: 10 max: 10
compileSizeLimit: process.env["COMPILE_SIZE_LIMIT"] or "7mb"
path: path:
compilesDir: Path.resolve(__dirname + "/../compiles") compilesDir: Path.resolve(__dirname + "/../compiles")
clsiCacheDir: Path.resolve(__dirname + "/../cache") clsiCacheDir: Path.resolve(__dirname + "/../cache")
@@ -32,6 +34,7 @@ module.exports =
apis: apis:
clsi: clsi:
url: "http://#{process.env['CLSI_HOST'] or 'localhost'}:3013" url: "http://#{process.env['CLSI_HOST'] or 'localhost'}:3013"
smokeTest: process.env["SMOKE_TEST"] or false smokeTest: process.env["SMOKE_TEST"] or false
project_cache_length_ms: 1000 * 60 * 60 * 24 project_cache_length_ms: 1000 * 60 * 60 * 24