Fix rule logging

This commit is contained in:
Akkadius 2019-09-16 23:48:32 -05:00
parent 4e2b2aca6a
commit 578fafb485
2 changed files with 6 additions and 7 deletions

View File

@ -447,7 +447,7 @@ bool RuleManager::UpdateInjectedRules(Database *db, const char *ruleset_name, bo
if (!quiet_update) { if (!quiet_update) {
LogInfo( LogInfo(
"New Rule '%s' found... Adding to `rule_values` table with ruleset '%s' (%i) and rule value '%s'...", "Adding new rule [{}] ruleset [{}] ({}) value [{}]",
rd_iter.first.c_str(), rd_iter.first.c_str(),
ruleset_name, ruleset_name,
ruleset_id, ruleset_id,
@ -475,9 +475,8 @@ bool RuleManager::UpdateInjectedRules(Database *db, const char *ruleset_name, bo
} }
LogInfo( LogInfo(
"%u New Rule%s Added to ruleset '%s' (%i)", "[{}] New rule(s) added to ruleset [{}] [{}]",
injected_rule_entries.size(), injected_rule_entries.size(),
(injected_rule_entries.size() == 1 ? "" : "s"),
ruleset_name, ruleset_name,
ruleset_id ruleset_id
); );
@ -518,7 +517,7 @@ bool RuleManager::UpdateOrphanedRules(Database *db, bool quiet_update)
if (!quiet_update) { if (!quiet_update) {
LogInfo( LogInfo(
"Rule '%s' no longer exists... Deleting orphaned entry from `rule_values` table...", "Rule [{}] no longer exists... Deleting orphaned entry from `rule_values` table...",
row[0] row[0]
); );
} }
@ -539,7 +538,7 @@ bool RuleManager::UpdateOrphanedRules(Database *db, bool quiet_update)
} }
LogInfo( LogInfo(
"%u Orphaned Rule%s Deleted from 'All Rulesets' (-1)", "[{}] Orphaned Rule%s Deleted from 'All Rulesets' (-1)",
orphaned_rule_entries.size(), orphaned_rule_entries.size(),
(orphaned_rule_entries.size() == 1 ? "" : "s") (orphaned_rule_entries.size() == 1 ? "" : "s")
); );
@ -596,7 +595,7 @@ bool RuleManager::RestoreRuleNotes(Database *db)
} }
if (update_count > 0) { if (update_count > 0) {
LogInfo("%u Rule Note%s Restored", update_count, (update_count == 1 ? "" : "s")); LogInfo("[{}] Rule Note [{}] Restored", update_count, (update_count == 1 ? "" : "s"));
} }
return true; return true;

View File

@ -501,7 +501,7 @@ namespace LoginserverWebserver {
token_count++; token_count++;
} }
LogInfo("Loaded [{}] API tokens", token_count); LogInfo("Loaded [{}] API token(s)", token_count);
} }
/** /**