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

Merge branch 'ho-dockerise' of github.com:sharelatex/clsi-sharelatex into ho-dockerise

Browse Source
This commit is contained in:
Henry Oswald
2018-03-02 18:31:09 +00:00
parent 49a35c5e11 c6b962a8b9
commit ae7357778e
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/CompileController.coffee
View File

@@ -40,8 +40,10 @@ module.exports = CompileController =
for file in outputFiles for file in outputFiles
if file.path?.match(/output\.pdf$/) if file.path?.match(/output\.pdf$/)
status = "success" status = "success"
if status == "failure" if status == "failure"
logger.err project_id: request.project_id, outputFiles:outputFiles, "project failed to compile successfully, no output.pdf generated" logger.err project_id: request.project_id, outputFiles:outputFiles, "project failed to compile successfully, no output.pdf generated"
# log an error if any core files are found # log an error if any core files are found
for file in outputFiles for file in outputFiles
if file.path is "core" if file.path is "core"

1
config/settings.defaults.coffee
View File

@@ -45,5 +45,4 @@ if process.env["COMMAND_RUNNER"]
module.exports.path.sandboxedCompilesHostDir = process.env["COMPILES_HOST_DIR"] module.exports.path.sandboxedCompilesHostDir = process.env["COMPILES_HOST_DIR"]
#TODO this can be deleted once module is merged in
module.exports.path.synctexBinHostPath = process.env["SYNCTEX_BIN_HOST_PATH"] module.exports.path.synctexBinHostPath = process.env["SYNCTEX_BIN_HOST_PATH"]

1
package.json
View File

@@ -24,6 +24,7 @@
"compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests", "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests",
"nodemon": "nodemon --config nodemon.json" "nodemon": "nodemon --config nodemon.json"
}, },
"author": "James Allen <james@sharelatex.com>",
"dependencies": { "dependencies": {
"async": "0.2.9", "async": "0.2.9",
"body-parser": "^1.2.0", "body-parser": "^1.2.0",