Refactoring: rename evaluate to execute on actions

This commit is contained in:
Felipe Zimmerle
2019-02-25 21:47:51 -03:00
parent a5a0f261e2
commit 14a60ef46c
168 changed files with 230 additions and 237 deletions

View File

@@ -49,7 +49,7 @@ bool Allow::init(std::string *error) {
}
bool Allow::evaluate(RuleWithActions *rule, Transaction *transaction) {
bool Allow::execute(RuleWithActions *rule, Transaction *transaction) {
ms_dbg_a(transaction, 4, "Dropping the evaluation of upcoming rules " \
"in favor of an `allow' action of type: " \
+ allowTypeToName(m_allowType));

View File

@@ -59,7 +59,7 @@ class Allow : public Action {
bool init(std::string *error) override;
bool evaluate(RuleWithActions *rule, Transaction *transaction) override;
bool execute(RuleWithActions *rule, Transaction *transaction) override;
bool isDisruptive() override { return true; }
AllowType m_allowType;

View File

@@ -28,7 +28,7 @@ namespace actions {
namespace disruptive {
bool Deny::evaluate(RuleWithActions *rule, Transaction *transaction,
bool Deny::execute(RuleWithActions *rule, Transaction *transaction,
RuleMessage &rm) {
ms_dbg_a(transaction, 8, "Running action deny");

View File

@@ -33,7 +33,7 @@ class Deny : public Action {
public:
explicit Deny(const std::string &action) : Action(action) { }
bool evaluate(RuleWithActions *rule, Transaction *transaction,
bool execute(RuleWithActions *rule, Transaction *transaction,
RuleMessage &rm) override;
bool isDisruptive() override { return true; }
};

View File

@@ -32,7 +32,7 @@ namespace actions {
namespace disruptive {
bool Drop::evaluate(RuleWithActions *rule, Transaction *transaction,
bool Drop::execute(RuleWithActions *rule, Transaction *transaction,
RuleMessage &rm) {
ms_dbg_a(transaction, 8, "Running action drop " \
"[executing deny instead of drop.]");

View File

@@ -32,7 +32,7 @@ class Drop : public Action {
public:
explicit Drop(const std::string &action) : Action(action) { }
bool evaluate(RuleWithActions *rule, Transaction *transaction,
bool execute(RuleWithActions *rule, Transaction *transaction,
RuleMessage &rm) override;
bool isDisruptive() override { return true; }
};

View File

@@ -29,7 +29,7 @@ namespace actions {
namespace disruptive {
bool Pass::evaluate(RuleWithActions *rule, Transaction *transaction,
bool Pass::execute(RuleWithActions *rule, Transaction *transaction,
RuleMessage &rm) {
intervention::free(&transaction->m_it);
intervention::reset(&transaction->m_it);

View File

@@ -31,7 +31,7 @@ class Pass : public Action {
public:
explicit Pass(const std::string &action) : Action(action) { }
bool evaluate(RuleWithActions *rule, Transaction *transaction,
bool execute(RuleWithActions *rule, Transaction *transaction,
RuleMessage &rm) override;
bool isDisruptive() override { return true; }
};

View File

@@ -34,7 +34,7 @@ bool Redirect::init(std::string *error) {
}
bool Redirect::evaluate(RuleWithActions *rule, Transaction *transaction,
bool Redirect::execute(RuleWithActions *rule, Transaction *transaction,
RuleMessage &rm) {
std::string m_urlExpanded(m_string->evaluate(transaction));
/* if it was changed before, lets keep it. */

View File

@@ -46,7 +46,7 @@ class Redirect : public Action {
m_status(0),
m_string(std::move(z)) { }
bool evaluate(RuleWithActions *rule, Transaction *transaction,
bool execute(RuleWithActions *rule, Transaction *transaction,
RuleMessage &rm) override;
bool init(std::string *error) override;
bool isDisruptive() override { return true; }