refs #7584 workerTimeControl #6

Open
robert wants to merge 4 commits from 7584-workerTimeControl into master
1 changed files with 3 additions and 1 deletions
Showing only changes of commit 6b53029c06 - Show all commits

View File

@ -522,7 +522,9 @@ module.exports = class MyLogger {
`[${action}]`[actionColor[action]], `[${action}]`[actionColor[action]],
`${logInfo.name}: ${originFk}, ${modelName}: ${modelId}` `${logInfo.name}: ${originFk}, ${modelName}: ${modelId}`
); );
const noInclude = tableInfo.rowExcludeField && !row.editorFk; const noInclude = tableInfo.rowExcludeField && !row.editorFk;
try { try {
if (isDelete && (!tableInfo.rowExcludeField || noInclude)) { if (isDelete && (!tableInfo.rowExcludeField || noInclude)) {
[[deleteRow]] = await logInfo.fetchStmt.execute([ [[deleteRow]] = await logInfo.fetchStmt.execute([
@ -540,7 +542,7 @@ module.exports = class MyLogger {
} }
if (!conf.testMode && (!isDelete || !deleteRow)) { if (!conf.testMode && (!isDelete || !deleteRow)) {
async function log(originFk) { async function log(originFk) {
if (originFk == null ||noInclude) return; if (originFk == null || noInclude) return;
await logInfo.addStmt.execute([ await logInfo.addStmt.execute([
originFk, originFk,
row[tableInfo.userField] ?? null, row[tableInfo.userField] ?? null,