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

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

Browse source
This commit is contained in:
Henry Oswald 2016-12-13 09:14:31 +00:00
commit 33df3346f8
6 changed files with 1947 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/spelling/app.coffee
View file

@ -1,6 +1,9 @@
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
logger = require 'logger-sharelatex' logger = require 'logger-sharelatex'
logger.initialize("spelling-sharelatex") logger.initialize("spelling-sharelatex")
if Settings.sentry?.dsn?
logger.initializeErrorReporting(Settings.sentry.dsn)
SpellingAPIController = require './app/js/SpellingAPIController' SpellingAPIController = require './app/js/SpellingAPIController'
express = require('express') express = require('express')
Path = require("path") Path = require("path")

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

@ -41,8 +41,11 @@ class ASpellWorker
output = output + chunk output = output + chunk
# We receive the language code from Aspell as the end of data marker # We receive the language code from Aspell as the end of data marker
if chunk.toString().match(endMarker) if chunk.toString().match(endMarker)
@callback(null, output.slice()) if @callback?
@callback = null # only allow one callback in use @callback(null, output.slice())
@callback = null # only allow one callback in use
else
logger.err process: @pipe.pid, lang: @language, "end of data marker received when callback already used"
@state = 'ready' @state = 'ready'
output = "" output = ""
error = "" error = ""

1
services/spelling/app/coffee/ASpellWorkerPool.coffee
View file

@ -37,7 +37,6 @@ class ASpellWorkerPool
metrics.gauge 'aspellWorkerPool-size', @PROCESS_POOL.length metrics.gauge 'aspellWorkerPool-size', @PROCESS_POOL.length
check: (language, words, timeout, callback) -> check: (language, words, timeout, callback) ->
logger.log lang: language, words: words.length, timeout: timeout, "aspell worker running check"
# look for an existing process in the pool # look for an existing process in the pool
availableWorker = _.find @PROCESS_POOL, (cached) -> availableWorker = _.find @PROCESS_POOL, (cached) ->
cached.language == language && cached.isReady() cached.language == language && cached.isReady()

1
services/spelling/app/coffee/LearnedWordsManager.coffee
View file

@ -17,7 +17,6 @@ module.exports = LearnedWordsManager =
getLearnedWords: (user_token, callback = (error, words)->) -> getLearnedWords: (user_token, callback = (error, words)->) ->
mongoCachedWords = mongoCache.get(user_token) mongoCachedWords = mongoCache.get(user_token)
if mongoCachedWords? if mongoCachedWords?
logger.info user_token:user_token, "mongoCache hit"
metrics.inc "mongoCache-hit", 0.1 metrics.inc "mongoCache-hit", 0.1
return callback(null, mongoCachedWords) return callback(null, mongoCachedWords)

1938
services/spelling/npm-shrinkwrap.json generated Normal file
View file

File diff suppressed because it is too large Load diff

2
services/spelling/package.json
View file

@ -14,7 +14,7 @@
"express": "^4.12.1", "express": "^4.12.1",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.1.0", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.1.0",
"lru-cache": "^4.0.0", "lru-cache": "^4.0.0",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.3.0", "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.5.0",
"mongojs": "1.3.0", "mongojs": "1.3.0",
"node-statsd": "0.0.3", "node-statsd": "0.0.3",
"redis": "~0.8.4", "redis": "~0.8.4",