refs #7584 workerTimeControl #6

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

View File

@ -4,6 +4,7 @@ logMainShowField: false
upperCaseTable: true upperCaseTable: true
userField: editorFk userField: editorFk
rowExcludeField: logExclude rowExcludeField: logExclude
ignoreSystem: false
excludeRegex: '__$' excludeRegex: '__$'
showFields: showFields:
- name - name

View File

@ -523,10 +523,8 @@ module.exports = class MyLogger {
`${logInfo.name}: ${originFk}, ${modelName}: ${modelId}` `${logInfo.name}: ${originFk}, ${modelName}: ${modelId}`
); );
const noInclude = tableInfo.rowExcludeField && !row.editorFk;
try { try {
if (isDelete && (!tableInfo.rowExcludeField || noInclude)) { if (isDelete) {
[[deleteRow]] = await logInfo.fetchStmt.execute([ [[deleteRow]] = await logInfo.fetchStmt.execute([
modelName, modelId, originFk modelName, modelId, originFk
]); ]);
@ -542,7 +540,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) return;
await logInfo.addStmt.execute([ await logInfo.addStmt.execute([
originFk, originFk,
row[tableInfo.userField] ?? null, row[tableInfo.userField] ?? null,