Skip to content

Commit 91daeee

Browse files
author
Felipe Zimmerle
committed
Only calling server log if the message is not disruptive
The disruptive message is already part of the interception object
1 parent 448897d commit 91daeee

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/rule.cc

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -741,8 +741,11 @@ bool Rule::evaluate(Transaction *trans,
741741
if (m_containsMultiMatchAction && isItToBeLogged) {
742742
/* warn */
743743
trans->m_rulesMessages.push_back(*ruleMessage);
744+
744745
/* error */
745-
trans->serverLog(ruleMessage);
746+
if (!ruleMessage->m_isDisruptive) {
747+
trans->serverLog(ruleMessage);
748+
}
746749

747750
RuleMessage *rm = new RuleMessage(this, trans);
748751
rm->m_saveMessage = ruleMessage->m_saveMessage;
@@ -795,14 +798,19 @@ bool Rule::evaluate(Transaction *trans,
795798
&& !ruleMessage->m_message.empty()) {
796799
/* warn */
797800
trans->m_rulesMessages.push_back(*ruleMessage);
801+
798802
/* error */
799-
trans->serverLog(ruleMessage);
803+
if (!ruleMessage->m_isDisruptive) {
804+
trans->serverLog(ruleMessage);
805+
}
800806
}
801807
else if (m_containsStaticBlockAction && !m_containsMultiMatchAction) {
802808
/* warn */
803809
trans->m_rulesMessages.push_back(*ruleMessage);
804810
/* error */
805-
trans->serverLog(ruleMessage);
811+
if (!ruleMessage->m_isDisruptive) {
812+
trans->serverLog(ruleMessage);
813+
}
806814
}
807815

808816
return true;

0 commit comments

Comments
 (0)