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

Merge branch 'master' of https://github.com/sharelatex/clsi-sharelatex

Browse Source
This commit is contained in:
Henry Oswald
2016-05-19 16:57:19 +01:00
parent 6b107bd20a f8ae215c1e
commit 855169b571
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.coffee
View File

@@ -158,8 +158,8 @@ server = net.createServer (socket) ->
socket.write("up, #{freeLoadPercentage}%\n", "ASCII") socket.write("up, #{freeLoadPercentage}%\n", "ASCII")
socket.end() socket.end()
server.listen port = (Settings.internal?.clsi?.load_port or 3044), -> server.listen load_port = (Settings.internal?.clsi?.load_port or 3044), ->
logger.info "tcp load endpoint listening on port #{port}" logger.info "tcp load endpoint listening on port #{load_port}"
# telnet 127.0.0.1 3044 # telnet 127.0.0.1 3044

1
app/coffee/CompileController.coffee
View File

@@ -34,6 +34,7 @@ module.exports = CompileController =
error: error?.message or error error: error?.message or error
outputFiles: outputFiles.map (file) -> outputFiles: outputFiles.map (file) ->
url: "#{Settings.apis.clsi.url}/project/#{request.project_id}/output/#{file.path}" url: "#{Settings.apis.clsi.url}/project/#{request.project_id}/output/#{file.path}"
path: file.path
type: file.type type: file.type
build: file.build build: file.build
} }

1
test/unit/coffee/CompileControllerTests.coffee
View File

@@ -76,6 +76,7 @@ describe "CompileController", ->
error: null error: null
outputFiles: @output_files.map (file) => outputFiles: @output_files.map (file) =>
url: "#{@Settings.apis.clsi.url}/project/#{@project_id}/output/#{file.path}" url: "#{@Settings.apis.clsi.url}/project/#{@project_id}/output/#{file.path}"
path: file.path
type: file.type type: file.type
build: file.build build: file.build
) )