diff --git a/go.mod b/go.mod index cf52ed38..23982e52 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/google/gopacket v1.1.19 github.com/google/uuid v1.3.0 github.com/schollz/progressbar/v3 v3.8.6 + github.com/withmandala/go-log v0.1.0 golang.org/x/net v0.0.0-20220225172249-27dd8689420f ) @@ -14,6 +15,7 @@ require ( github.com/mattn/go-runewidth v0.0.13 // indirect github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect github.com/rivo/uniseg v0.2.0 // indirect + github.com/smartystreets/goconvey v1.7.2 // indirect github.com/stretchr/testify v1.7.0 // indirect golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect diff --git a/go.sum b/go.sum index 97b1b29f..b8b8a04e 100644 --- a/go.sum +++ b/go.sum @@ -11,6 +11,10 @@ github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= @@ -25,16 +29,23 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/schollz/progressbar/v3 v3.8.6 h1:QruMUdzZ1TbEP++S1m73OqRJk20ON11m6Wqv4EoGg8c= github.com/schollz/progressbar/v3 v3.8.6/go.mod h1:W5IEwbJecncFGBvuEh4A7HT1nZZ6WNIL2i3qbnI0WKY= +github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= +github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= +github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/withmandala/go-log v0.1.0 h1:wINmTEe7BQ6zEA8sE7lSsYeaxCLluK6RFjF/IB5tzkA= +github.com/withmandala/go-log v0.1.0/go.mod h1:/V9xQUTW74VjYm3u2Liv/bIUGLWoL9z2GlHwtscp4vg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -57,6 +68,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/logs/logs.go b/logs/logs.go index e0dc59c3..bcc1240b 100644 --- a/logs/logs.go +++ b/logs/logs.go @@ -2,7 +2,9 @@ package logs import ( "fmt" - "log" + "os" + + logs "github.com/withmandala/go-log" ) type Level = int @@ -15,29 +17,35 @@ const ( ) type Logger struct { - Level Level + Level Level + logger *logs.Logger +} + +func New(level Level) *Logger { + logger := logs.New(os.Stderr).WithDebug().WithColor() + return &Logger{Level: level, logger: logger} } -var Default = Logger{Level: Info} +var Default = New(Info) func (l Logger) Debug(format string, a ...interface{}) { - if l.Level <= Debug { - log.Printf("[DEBUG] %s", fmt.Sprintf(format, a...)) + if l.Level <= Debug && l.logger != nil { + l.logger.Debugf("[DEBUG] %s", fmt.Sprintf(format, a...)) } } func (l Logger) Info(format string, a ...interface{}) { - if l.Level <= Info { - log.Printf("[INFO] %s", fmt.Sprintf(format, a...)) + if l.Level <= Info && l.logger != nil { + l.logger.Infof("[INFO] %s", fmt.Sprintf(format, a...)) } } func (l Logger) Warning(format string, a ...interface{}) { - if l.Level <= Warning { - log.Printf("[WARN] %s", fmt.Sprintf(format, a...)) + if l.Level <= Warning && l.logger != nil { + l.logger.Warnf("[WARN] %s", fmt.Sprintf(format, a...)) } } func (l Logger) Error(format string, a ...interface{}) { - log.Printf("[ERROR] %s", fmt.Sprintf(format, a...)) + l.logger.Errorf("[ERROR] %s", fmt.Sprintf(format, a...)) } diff --git a/main.go b/main.go index 06bfecf9..e5ff98d3 100644 --- a/main.go +++ b/main.go @@ -532,7 +532,11 @@ func fetchConfig(configPath string) (*Config, error) { func dumpMetrics(l *logs.Logger, path, name, clientID string) { bytesPerSecond := metrics.Default.Read(name) - l.Info("The app is generating approximately %v bytes per second", bytesPerSecond) + if bytesPerSecond > 0 { + l.Info("The app is generating approximately %v bytes per second", bytesPerSecond) + } else { + l.Warning("The app doesn't seem to generate any traffic, please contact your admin") + } if path == "" { return } @@ -675,12 +679,12 @@ func main() { flag.CommandLine.Usage() return } - l := logs.Logger{Level: logLevel} + l := logs.New(logLevel) clientID := uuid.New().String() go func() { for { time.Sleep(refreshTimeout) - dumpMetrics(&l, metricsPath, "traffic", clientID) + dumpMetrics(l, metricsPath, "traffic", clientID) } }() var cancel context.CancelFunc @@ -708,7 +712,7 @@ func main() { } if job, ok := jobs[jobDesc.Type]; ok { for i := 0; i < jobDesc.Count; i++ { - go job(ctx, &l, jobDesc.Args) + go job(ctx, l, jobDesc.Args) } } else { l.Warning("no such job - %s", jobDesc.Type)