github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-28 23:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup and comments

Browse source
This commit is contained in:
Brian Gough 2015-03-13 10:10:51 +00:00
parent 63ee4d1e7d
commit 9aaef729ad
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/filestore/app/coffee/FileConverter.coffee
View file

@ -1,7 +1,7 @@
_ = require("underscore")
metrics = require("metrics-sharelatex")
logger = require("logger-sharelatex")
safe_exec = require('./SafeExec')
safe_exec = require("./SafeExec")
approvedFormats = ["png"]
fourtySeconds = 40 * 1000

2
services/filestore/app/coffee/SafeExec.coffee
View file

@ -9,6 +9,7 @@ child_process = require('child_process')
# group, then we can kill everything in that process group.
module.exports = (command, options, callback = (err, stdout, stderr) ->) ->
# options are {timeout: number-of-milliseconds, killSignal: signal-name}
[cmd, args...] = command.split(' ')
child = child_process.spawn cmd, args, {detached:true}
@ -22,6 +23,7 @@ module.exports = (command, options, callback = (err, stdout, stderr) ->) ->
if options.timeout?
killTimer = setTimeout () ->
try
# use negative process id to kill process group
process.kill -child.pid, options.killSignal || "SIGTERM"
catch error
logger.log process: child.pid, kill_error: error, "error killing process"