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

added loads of debugging

Browse Source
This commit is contained in:
Henry Oswald
2018-08-19 11:38:27 +01:00
parent eec0529ef7
commit 988f177f79
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/coffee/LockManager.coffee
View File

@@ -2,7 +2,8 @@ Settings = require('settings-sharelatex')
logger = require "logger-sharelatex" logger = require "logger-sharelatex"
Lockfile = require('lockfile') # from https://github.com/npm/lockfile Lockfile = require('lockfile') # from https://github.com/npm/lockfile
Errors = require "./Errors" Errors = require "./Errors"
fs = require("fs")
Path = require("path")
module.exports = LockManager = module.exports = LockManager =
LOCK_TEST_INTERVAL: 1000 # 50ms between each test of the lock LOCK_TEST_INTERVAL: 1000 # 50ms between each test of the lock
MAX_LOCK_WAIT_TIME: 15000 # 10s maximum time to spend trying to get the lock MAX_LOCK_WAIT_TIME: 15000 # 10s maximum time to spend trying to get the lock
@@ -15,7 +16,9 @@ module.exports = LockManager =
stale: @LOCK_STALE stale: @LOCK_STALE
Lockfile.lock path, lockOpts, (error) -> Lockfile.lock path, lockOpts, (error) ->
return callback new Errors.AlreadyCompilingError("compile in progress") if error?.code is 'EEXIST' return callback new Errors.AlreadyCompilingError("compile in progress") if error?.code is 'EEXIST'
return callback(error) if error? if error?
logger.err error:error, path:path, statLock:fs.lstatSync(path), statDir: fs.lstatSync(path.dirname(path)), "unable to get lock"
return callback(error)
runner (error1, args...) -> runner (error1, args...) ->
Lockfile.unlock path, (error2) -> Lockfile.unlock path, (error2) ->
error = error1 or error2 error = error1 or error2

10
app/coffee/ProjectPersistenceManager.coffee
View File

@@ -51,12 +51,16 @@ module.exports = ProjectPersistenceManager =
clearProjectFromCache: (project_id, callback = (error) ->) -> clearProjectFromCache: (project_id, callback = (error) ->) ->
logger.log project_id: project_id, "clearing project from cache" logger.log project_id: project_id, "clearing project from cache"
UrlCache.clearProject project_id, (error) -> UrlCache.clearProject project_id, (error) ->
return callback(error) if error? if error?
logger.err error:error, project_id: project_id, "error clearing project from cache"
return callback(error)
ProjectPersistenceManager._clearProjectFromDatabase project_id, (error) -> ProjectPersistenceManager._clearProjectFromDatabase project_id, (error) ->
return callback(error) if error? if error?
callback() logger.err error:error, project_id:project_id, "error clearing project from database"
callback(error)
_clearProjectFromDatabase: (project_id, callback = (error) ->) -> _clearProjectFromDatabase: (project_id, callback = (error) ->) ->
logger.log project_id:project_id, "clearing project from database"
job = (cb)-> job = (cb)->
db.Project.destroy(where: {project_id: project_id}) db.Project.destroy(where: {project_id: project_id})
.then(() -> cb()) .then(() -> cb())