Просмотр исходного кода

Merge pull request #1366 from sharelatex/ho-bump-compile-size

Bump compile size

GitOrigin-RevId: 087e8556a7e2e39bed486cdd8829bf427aaed68b
Henry Oswald 7 лет назад
Родитель
Сommit
68a0ff08ea

+ 3 - 2
services/web/app/coffee/Features/Compile/ClsiFormatChecker.coffee

@@ -1,5 +1,6 @@
 _ = require("lodash")
 _ = require("lodash")
 async = require("async")
 async = require("async")
+settings = require("settings-sharelatex")
 
 
 module.exports = ClsiFormatChecker =
 module.exports = ClsiFormatChecker =
 
 
@@ -39,7 +40,7 @@ module.exports = ClsiFormatChecker =
 
 
 	_checkDocsAreUnderSizeLimit: (resources, callback)->
 	_checkDocsAreUnderSizeLimit: (resources, callback)->
 		
 		
-		FIVEMB = 1000 * 1000 * 5
+		sizeLimit = 1000 * 1000 * settings.compileBodySizeLimitMb
 
 
 		totalSize = 0
 		totalSize = 0
 
 
@@ -53,7 +54,7 @@ module.exports = ClsiFormatChecker =
 			totalSize += result.size
 			totalSize += result.size
 			return result
 			return result
 
 
-		tooLarge = totalSize > FIVEMB
+		tooLarge = totalSize > sizeLimit
 		if !tooLarge
 		if !tooLarge
 			return callback()
 			return callback()
 		else
 		else

+ 2 - 0
services/web/config/settings.defaults.coffee

@@ -488,6 +488,8 @@ module.exports = settings =
 
 
 	# currentImage: "texlive-full:2017.1"
 	# currentImage: "texlive-full:2017.1"
 	# imageRoot: "<DOCKER REPOSITORY ROOT>" # without any trailing slash
 	# imageRoot: "<DOCKER REPOSITORY ROOT>" # without any trailing slash
+	
+	compileBodySizeLimitMb: process.env['COMPILE_BODY_SIZE_LIMIT_MB'] or 5
 
 
 	# allowedImageNames: [
 	# allowedImageNames: [
 	# 	{imageName: 'texlive-full:2017.1', imageDesc: 'TeXLive 2017'}
 	# 	{imageName: 'texlive-full:2017.1', imageDesc: 'TeXLive 2017'}

+ 1 - 1
services/web/test/unit/coffee/Compile/ClsiFormatCheckerTests.coffee

@@ -8,7 +8,7 @@ SandboxedModule = require('sandboxed-module')
 describe "ClsiFormatChecker", ->
 describe "ClsiFormatChecker", ->
 	beforeEach ->
 	beforeEach ->
 		@ClsiFormatChecker = SandboxedModule.require modulePath, requires:
 		@ClsiFormatChecker = SandboxedModule.require modulePath, requires:
-			"settings-sharelatex": @settings ={}
+			"settings-sharelatex": @settings = { compileBodySizeLimitMb: 5 }
 			"logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub(), warn: sinon.stub() }
 			"logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub(), warn: sinon.stub() }
 		@project_id = "project-id"
 		@project_id = "project-id"