pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

add function cleanupCache

Browse Source
This commit is contained in:
konovalovsergey
2016-03-29 17:39:14 +03:00
committed by Alexander.Trofimov
parent b36e38b3cd
commit 6b0f2c56b0
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DocService/sources/canvasservice.js
View File

File diff suppressed because one or more lines are too long

8
DocService/sources/converterservice.js
View File

@ -32,9 +32,8 @@ function* getConvertStatus(cmd, selectRes, baseUrl) {
case taskResult.FileStatus.Err:
case taskResult.FileStatus.ErrToReload:
status.err = row.tr_status_info;
//todo
if (taskResult.FileStatus.ErrToReload == row.tr_status) {
yield taskResult.remove(docId);
yield canvasService.cleanupCache(docId);
}
break;
case taskResult.FileStatus.NeedParams:
@ -132,10 +131,7 @@ function convertHealthCheck(req, res) {
output = true;
}
//clean up
var removeRes = yield taskResult.remove(docId);
if (removeRes.affectedRows > 0) {
yield storage.deletePath(docId);
}
yield canvasService.cleanupCache(docId);
logger.debug('End convertHealthCheck');
} catch (e) {
logger.error('Error convertHealthCheck\r\n%s', e.stack);

6
DocService/sources/gc.js
View File

@ -3,6 +3,7 @@ var co = require('co');
var cron = require('cron');
var taskResult = require('./taskresult');
var docsCoServer = require('./DocsCoServer');
var canvasService = require('./canvasservice');
var storage = require('./../../Common/sources/storage-base');
var utils = require('./../../Common/sources/utils');
var logger = require('./../../Common/sources/logger');
@ -35,11 +36,8 @@ var checkFileExpire = function() {
//проверяем что никто не сидит в документе
var hvals = yield docsCoServer.getAllPresencePromise(docId);
if(0 == hvals.length){
var removeRes = yield taskResult.remove(docId);
//если ничего не удалилось, значит это сделал другой процесс
if (removeRes.affectedRows > 0) {
if (yield canvasService.cleanupCache(docId)) {
currentRemovedCount++;
yield storage.deletePath(docId);
}
} else {
logger.debug('checkFileExpire expire but presence: hvals = %s; docId = %s', hvals, docId);