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

[log] Log callbackUrl response different from {"error": 0}; Change 'storeForgotten' and backoff log level to warn;

Browse Source
This commit is contained in:
konovalovsergey
2020-06-07 02:11:03 +03:00
committed by Sergey Konovalov
parent 3c51c3866e
commit d8fe8d15b1
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DocService/sources/canvasservice.js
View File

@ -780,6 +780,9 @@ function* commandSfcCallback(cmd, isSfcm, isEncrypted) {
replyStr = yield* docsCoServer.sendServerRequest(docId, uri, outputSfc, checkAuthorizationLength);
let replyData = docsCoServer.parseReplyData(docId, replyStr);
isSfcmSuccess = replyData && commonDefines.c_oAscServerCommandErrors.NoError == replyData.error;
if (replyData && commonDefines.c_oAscServerCommandErrors.NoError != replyData.error) {
logger.warn('sendServerRequest returned an error: docId = %s; data = %s', docId, replyStr);
}
} catch (err) {
logger.error('sendServerRequest error: docId = %s;url = %s;data = %j\r\n%s', docId, uri, outputSfc, err.stack);
}
@ -810,7 +813,7 @@ function* commandSfcCallback(cmd, isSfcm, isEncrypted) {
if (attempt < cfgCallbackBackoffOptions.retries) {
needRetry = true;
} else {
logger.debug('commandSfcCallback backoff limit exceeded: docId = %s', docId);
logger.warn('commandSfcCallback backoff limit exceeded: docId = %s', docId);
}
}
}
@ -821,6 +824,9 @@ function* commandSfcCallback(cmd, isSfcm, isEncrypted) {
var savedVal = yield docsCoServer.editorData.getdelSaved(docId);
requestRes = (null == savedVal || '1' === savedVal);
}
if (replyData && commonDefines.c_oAscServerCommandErrors.NoError != replyData.error) {
logger.warn('sendServerRequest returned an error: docId = %s; data = %s', docId, replyStr);
}
if (requestRes) {
updateIfTask = undefined;
yield docsCoServer.cleanDocumentOnExitPromise(docId, true);
@ -851,7 +857,7 @@ function* commandSfcCallback(cmd, isSfcm, isEncrypted) {
}
if (storeForgotten && !needRetry && !isEncrypted && (!isError || isErrorCorrupted)) {
try {
logger.debug("storeForgotten: docId = %s", docId);
logger.warn("storeForgotten: docId = %s", docId);
let forgottenName = cfgForgottenFilesName + pathModule.extname(cmd.getOutputPath());
yield storage.copyObject(savePathDoc, cfgForgottenFiles + '/' + docId + '/' + forgottenName);
} catch (err) {
@ -927,6 +933,9 @@ function* commandSendMMCallback(cmd) {
outputMailMerge.setRecordErrorCount(recordErrorCount);
mailMergeSendData.setRecordErrorCount(recordErrorCount);
}
if (replyData && commonDefines.c_oAscServerCommandErrors.NoError != replyData.error) {
logger.warn('sendServerRequest returned an error: docId = %s; data = %s', docId, replyStr);
}
}
var newRecordFrom = mailMergeSendData.getRecordFrom() + Math.max(files.length, 1);
if (newRecordFrom <= mailMergeSendData.getRecordTo()) {