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

Merge branch 'master' into ho-dockerise

Browse Source
This commit is contained in:
Henry Oswald
2018-03-02 18:11:45 +00:00
parent b9874b5ae5 12c1dc632a
commit 49a35c5e11
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/coffee/CompileController.coffee
View File

@@ -42,6 +42,10 @@ module.exports = CompileController =
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
for file in outputFiles
if file.path is "core"
logger.error project_id:request.project_id, req:req, outputFiles:outputFiles, "core file found in output"
timer.done() timer.done()
res.status(code or 200).send { res.status(code or 200).send {

3
config/settings.defaults.coffee
View File

@@ -19,7 +19,8 @@ module.exports =
internal: internal:
clsi: clsi:
port: 3013 port: 3013
host: process.env["LISTEN_ADDRESS"] or "0.0.0.0" host: process.env["LISTEN_ADDRESS"] or "localhost"
apis: apis:
clsi: clsi:
url: "http://#{process.env['CLSI_HOST'] or 'localhost'}:3013" url: "http://#{process.env['CLSI_HOST'] or 'localhost'}:3013"

1
package.json
View File

@@ -24,7 +24,6 @@
"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",