diff --git a/Common/config/default.json b/Common/config/default.json index 27d23807..3237f89d 100644 --- a/Common/config/default.json +++ b/Common/config/default.json @@ -350,11 +350,11 @@ "forcesave": 604800, "forcesaveLock": 5000, "saved": 3600, - "documentsCron": "*/10 * * * * *", + "documentsCron": "0 */2 * * * *", "files": 86400, "filesCron": "00 00 */1 * * *", "filesremovedatonce": 100, - "sessionidle": "10s", + "sessionidle": "1h", "sessionabsolute": "30d", "sessionclosecommand": "2m", "pemStdTTL": "1h", @@ -455,7 +455,7 @@ "license" : { "license_file": "", "warning_limit_percents": 70, - "packageType": 1, + "packageType": 0, "warning_license_expiration": "30d" }, "FileConverter": { diff --git a/DocService/sources/wopiClient.js b/DocService/sources/wopiClient.js index c874aea5..02903d0d 100644 --- a/DocService/sources/wopiClient.js +++ b/DocService/sources/wopiClient.js @@ -421,7 +421,7 @@ function checkAndInvalidateCache(ctx, docId, fileInfo) { let hasUnlockMarker = isWopiUnlockMarker(unlockMarkStr); let isUpdateVersion = commonDefines.FileStatus.UpdateVersion === row.status; ctx.logger.debug('wopiEditor hasUnlockMarker=%s isUpdateVersion=%s', hasUnlockMarker, isUpdateVersion); - if (hasUnlockMarker || isUpdateVersion || !commonInfo.fileInfo.SupportsLocks) { + if (hasUnlockMarker || isUpdateVersion) { let fileInfoVersion = fileInfo.Version; let cacheVersion = commonInfo.fileInfo.Version; let fileInfoModified = fileInfo.LastModifiedTime; @@ -905,10 +905,10 @@ async function unlock(ctx, wopiParams) { ctx.logger.debug('wopi Unlock request uri=%s headers=%j', uri, headers); let postRes = await utils.postRequestPromise(ctx, uri, undefined, undefined, undefined, tenCallbackRequestTimeout, undefined, headers); ctx.logger.debug('wopi Unlock response headers=%j', postRes.response.headers); - res = true; } else { ctx.logger.info('wopi SupportsLocks = false'); } + res = true; } catch (err) { ctx.logger.error('wopi error Unlock:%s', err.stack); } finally {