From a48e5b86a9ae5f39bfbdaa2e38194f47517ba060 Mon Sep 17 00:00:00 2001
From: Luyao Zhong <luyao.zhong@intel.com>
Date: Mon, 9 Aug 2021 09:47:16 +0000
Subject: [PATCH] support logCb for disruptive actions

Signed-off-by: Luyao Zhong <luyao.zhong@intel.com>
---
 src/rule_with_actions.cc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/rule_with_actions.cc b/src/rule_with_actions.cc
index 8c61e853..902eaf30 100644
--- a/src/rule_with_actions.cc
+++ b/src/rule_with_actions.cc
@@ -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);