diff options
author | Emiliano Ciavatta | 2020-04-09 12:06:50 +0000 |
---|---|---|
committer | Emiliano Ciavatta | 2020-04-09 12:06:50 +0000 |
commit | f35049b2cc3a38475cf2a7967c92a81f2f296855 (patch) | |
tree | d7ae8503b10871f8d38b8b45e605d31d90768a45 /rules_manager.go | |
parent | 3d2997eb8b80792f09eb984f841c71b907894bcb (diff) |
Minor changes
Diffstat (limited to 'rules_manager.go')
-rw-r--r-- | rules_manager.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rules_manager.go b/rules_manager.go index e358fed..482188e 100644 --- a/rules_manager.go +++ b/rules_manager.go @@ -25,7 +25,7 @@ type Pattern struct { Flags RegexFlags `json:"flags"` MinOccurrences int `json:"min_occurrences"` MaxOccurrences int `json:"max_occurrences"` - internalId int + internalID int compiledPattern *hyperscan.Pattern } @@ -42,7 +42,7 @@ type Filter struct { } type Rule struct { - Id RowID `json:"-" bson:"_id,omitempty"` + ID RowID `json:"-" bson:"_id,omitempty"` Name string `json:"name" binding:"required,min=3" bson:"name"` Color string `json:"color" binding:"required,hexcolor" bson:"color"` Notes string `json:"notes" bson:"notes,omitempty"` @@ -90,13 +90,13 @@ func (rm RulesManager) LoadRules() error { } rm.ruleIndex = len(rules) - return rm.generateDatabase(rules[len(rules)-1].Id) + return rm.generateDatabase(rules[len(rules)-1].ID) } func (rm RulesManager) AddRule(context context.Context, rule Rule) (string, error) { rm.mPatterns.Lock() - rule.Id = rm.storage.NewCustomRowID(uint64(rm.ruleIndex), time.Now()) + rule.ID = rm.storage.NewCustomRowID(uint64(rm.ruleIndex), time.Now()) rule.Enabled = true if err := rm.validateAndAddRuleLocal(&rule); err != nil { @@ -104,7 +104,7 @@ func (rm RulesManager) AddRule(context context.Context, rule Rule) (string, erro return "", err } - if err := rm.generateDatabase(rule.Id); err != nil { + if err := rm.generateDatabase(rule.ID); err != nil { rm.mPatterns.Unlock() log.WithError(err).WithField("rule", rule).Panic("failed to generate database") } @@ -114,7 +114,7 @@ func (rm RulesManager) AddRule(context context.Context, rule Rule) (string, erro log.WithError(err).WithField("rule", rule).Panic("failed to insert rule on database") } - return rule.Id.Hex(), nil + return rule.ID.Hex(), nil } func (rm RulesManager) validateAndAddRuleLocal(rule *Rule) error { @@ -133,7 +133,7 @@ func (rm RulesManager) validateAndAddRuleLocal(rule *Rule) error { if err != nil { return err } - pattern.internalId = len(rm.patterns) + len(newPatterns) + pattern.internalID = len(rm.patterns) + len(newPatterns) newPatterns[hash] = pattern } @@ -141,7 +141,7 @@ func (rm RulesManager) validateAndAddRuleLocal(rule *Rule) error { rm.patterns[key] = value } - rm.rules[rule.Id.Hex()] = *rule + rm.rules[rule.ID.Hex()] = *rule rm.rulesByName[rule.Name] = *rule return nil |