Merge pull request #1 from LuyaoZhong/v3/master

support logCb for disruptive actions
This commit is contained in:
Le Yao 2021-08-10 08:47:47 +08:00 committed by GitHub
commit 9b8a53686f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -500,17 +500,23 @@ void RuleWithActions::performLogging(Transaction *trans,
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
*/
}
} else if (hasBlockAction() && !hasMultimatch()) {
/* warn */
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
*/
} else {
if (isItToBeLogged && !hasMultimatch()
&& !ruleMessage->m_message.empty()) {
@ -518,9 +524,12 @@ void RuleWithActions::performLogging(Transaction *trans,
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
*/
}
}
} else {
@ -529,10 +538,12 @@ void RuleWithActions::performLogging(Transaction *trans,
trans->m_rulesMessages.push_back(*ruleMessage.get());
/* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
*/
RuleMessage *rm = new RuleMessage(this, trans);
rm->m_saveMessage = ruleMessage->m_saveMessage;
ruleMessage.reset(rm);