github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-11 23:57:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Decimal support for events.stream.output.rotate.when

Browse source
This commit is contained in:
Giuseppe 2018-10-28 22:41:31 +01:00
parent fc7d8d22b4
commit 251dbb3ef2
4 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/events_stream.go
View file

@ -21,7 +21,7 @@ type rotation struct {
Compress bool Compress bool
Format string Format string
How string How string
Period int Period float64
} }
type EventsStream struct { type EventsStream struct {
@ -147,9 +147,9 @@ func NewEventsStream(s *session.Session) *EventsStream {
"", "",
"Datetime format to use for log rotation file names.")) "Datetime format to use for log rotation file names."))
stream.AddParam(session.NewIntParameter("events.stream.output.rotate.when", stream.AddParam(session.NewDecimalParameter("events.stream.output.rotate.when",
"10485760", "10",
"File size or time duration in seconds for log rotation.")) "File size (in MB) or time duration (in seconds) for log rotation."))
stream.AddParam(session.NewBoolParameter("events.stream.http.request.dump", stream.AddParam(session.NewBoolParameter("events.stream.http.request.dump",
"false", "false",
@ -193,7 +193,7 @@ func (s *EventsStream) Configure() (err error) {
return err return err
} else if err, s.rotation.How = s.StringParam("events.stream.output.rotate.how"); err != nil { } else if err, s.rotation.How = s.StringParam("events.stream.output.rotate.how"); err != nil {
return err return err
} else if err, s.rotation.Period = s.IntParam("events.stream.output.rotate.when"); err != nil { } else if err, s.rotation.Period = s.DecParam("events.stream.output.rotate.when"); err != nil {
return err return err
} }

2
modules/events_view.go
View file

@ -167,7 +167,7 @@ func (s *EventsStream) doRotation() {
doRotate := false doRotate := false
if info, err := s.output.Stat(); err == nil { if info, err := s.output.Stat(); err == nil {
if s.rotation.How == "size" { if s.rotation.How == "size" {
doRotate = info.Size() >= int64(s.rotation.Period) doRotate = float64(info.Size()) >= float64(s.rotation.Period*1024*1024)
} else if s.rotation.How == "time" { } else if s.rotation.How == "time" {
doRotate = info.ModTime().Unix()%int64(s.rotation.Period) == 0 doRotate = info.ModTime().Unix()%int64(s.rotation.Period) == 0
} }

14
session/module.go
View file

@ -109,6 +109,20 @@ func (m SessionModule) IntParam(name string) (error, int) {
} }
} }
func (m SessionModule) DecParam(name string) (error, float64) {
if p, found := m.params[name]; found {
if err, v := p.Get(m.Session); err != nil {
return err, 0
} else {
return nil, v.(float64)
}
} else {
return fmt.Errorf("Parameter %s does not exist.", name), 0
}
}
func (m SessionModule) BoolParam(name string) (error, bool) { func (m SessionModule) BoolParam(name string) (error, bool) {
if err, v := m.params[name].Get(m.Session); err != nil { if err, v := m.params[name].Get(m.Session); err != nil {
return err, false return err, false

8
session/module_param.go
View file

@ -18,6 +18,7 @@ const (
STRING ParamType = iota STRING ParamType = iota
BOOL = iota BOOL = iota
INT = iota INT = iota
FLOAT = iota
) )
type ModuleParam struct { type ModuleParam struct {
@ -57,6 +58,10 @@ func NewIntParameter(name string, def_value string, desc string) *ModuleParam {
return NewModuleParameter(name, def_value, INT, "^[\\d]+$", desc) return NewModuleParameter(name, def_value, INT, "^[\\d]+$", desc)
} }
func NewDecimalParameter(name string, def_value string, desc string) *ModuleParam {
return NewModuleParameter(name, def_value, FLOAT, "^[\\d]+(\\.\\d+)?$", desc)
}
func (p ModuleParam) Validate(value string) (error, interface{}) { func (p ModuleParam) Validate(value string) (error, interface{}) {
if p.Validator != nil { if p.Validator != nil {
if !p.Validator.MatchString(value) { if !p.Validator.MatchString(value) {
@ -78,6 +83,9 @@ func (p ModuleParam) Validate(value string) (error, interface{}) {
} else if p.Type == INT { } else if p.Type == INT {
i, err := strconv.Atoi(value) i, err := strconv.Atoi(value)
return err, i return err, i
} else if p.Type == FLOAT {
i, err := strconv.ParseFloat(value, 64)
return err, i
} }
return fmt.Errorf("Unhandled module parameter type %d.", p.Type), nil return fmt.Errorf("Unhandled module parameter type %d.", p.Type), nil