github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

move callback _.once down to Worker, add handler for process close event

Browse source 
should fix timeout errors in tests
This commit is contained in:
Brian Gough 2015-05-20 11:53:28 +01:00
parent 6a241cba28
commit f70476284b
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/spelling/app/coffee/ASpell.coffee
View file

@ -1,5 +1,4 @@
async = require "async"
_ = require "underscore"
ASpellWorkerPool = require "./ASpellWorkerPool"
LRU = require "lru-cache"
logger = require 'logger-sharelatex'
@ -87,7 +86,6 @@ module.exports = ASpell =
# http://aspell.net/man-html/Through-A-Pipe.html
checkWords: (language, words, callback = (error, result) ->) ->
runner = new ASpellRunner()
callback = _.once callback
runner.checkWords language, words, callback
ASPELL_TIMEOUT : 4000

15
services/spelling/app/coffee/ASpellWorker.coffee
View file

@ -1,6 +1,7 @@
child_process = require("child_process")
logger = require 'logger-sharelatex'
metrics = require('metrics-sharelatex')
_ = require "underscore"
BATCH_SIZE = 100
@ -15,16 +16,24 @@ class ASpellWorker
@state = 'killed'
logger.log process: @pipe.pid, lang: @language, "aspell worker has exited"
metrics.inc "aspellWorker-exit-" + @language
@pipe.on 'close', () =>
@state = 'closed' unless @state == 'killed'
if @callback?
logger.err process: @pipe.pid, lang: @language, "aspell worker closed output streams with uncalled callback"
@callback new Error("aspell worker closed output streams with uncalled callback"), []
@callback = null
@pipe.on 'error', (err) =>
@state = 'error' unless @state == 'killed'
logger.log process: @pipe.pid, error: err, stdout: output.slice(-1024), stderr: error.slice(-1024), lang: @language, "aspell worker error"
if @callback?
@callback err, []
@callback = null
@pipe.stdin.on 'error', (err) =>
@state = 'error' unless @state == 'killed'
logger.log process: @pipe.pid, error: err, stdout: output.slice(-1024), stderr: error.slice(-1024), lang: @language, "aspell worker error on stdin"
if @callback?
@callback err, []
@callback = null
output = ""
endMarker = new RegExp("^[a-z][a-z]", "m")
@ -33,6 +42,7 @@ class ASpellWorker
# We receive the language code from Aspell as the end of data marker
if chunk.toString().match(endMarker)
@callback(null, output.slice())
@callback = null # only allow one callback in use
@state = 'ready'
output = ""
error = ""
@ -52,7 +62,10 @@ class ASpellWorker
# we will now send data to aspell, and be ready again when we
# receive the end of data marker
@state = 'busy'
@callback = callback
if @callback? # only allow one callback in use
logger.err process: @pipe.pid, lang: @language, "CALLBACK ALREADY IN USE"
return @callback new Error("Aspell callback already in use - SHOULD NOT HAPPEN")
@callback = _.once callback # extra defence against double callback
@setTerseMode()
@write(words)
@flush()