diff --git a/docker-compose/test.sh b/docker-compose/test.sh index 233ebbf..87d6691 100755 --- a/docker-compose/test.sh +++ b/docker-compose/test.sh @@ -11,6 +11,5 @@ docker run \ -r 192.168.0.1:6379 \ -m 192.168.0.1:27017 \ -d lastlogin \ - -i test@10.39.253.206:8086 \ -T 80s \ $@ diff --git a/influxdb.go b/influxdb.go index be821d2..e0cdae4 100644 --- a/influxdb.go +++ b/influxdb.go @@ -3,7 +3,6 @@ package main import ( "fmt" - "log" "time" influxdb "github.com/influxdata/influxdb/client/v2" @@ -16,8 +15,7 @@ var ( func writeStats(start time.Time) { if opts.Debug { - fmt.Printf("writing to influxdb server: %s\n", opts.Influxdb) - fmt.Printf("host: %s -- addr: %s\n", infhost, infdb) + fmt.Printf("writing to influxdb server: %s", opts.Influxdb) } c, err := influxdb.NewHTTPClient(influxdb.HTTPConfig{ @@ -25,8 +23,7 @@ func writeStats(start time.Time) { Timeout: 2 * time.Second, }) if err != nil { - fmt.Printf("InfluxDB connect Error: %+v\n", err) - log.Printf("InfluxDB connect Error: %+v\n", err) + fmt.Printf("Error: %+v\n", err) return } defer c.Close() @@ -36,8 +33,7 @@ func writeStats(start time.Time) { Precision: "s", }) if err != nil { - fmt.Printf("InfluxDB batch Error: %+v\n", err) - log.Printf("InfluxDB batch Error: %+v\n", err) + fmt.Printf("Error: %+v\n", err) return } @@ -52,22 +48,12 @@ func writeStats(start time.Time) { } pt, err := influxdb.NewPoint("ll2mongo", tags, fields, start) if err != nil { - fmt.Printf("InfluxDB point Error: %+v\n", err) - log.Printf("InfluxDB point Error: %+v\n", err) + fmt.Printf("Error: %+v\n", err) return } - if opts.Debug { - fmt.Printf("InfluxDB pt: %+v\n", pt) - } - bp.AddPoint(pt) // Write the batch - err = c.Write(bp) - if err != nil { - fmt.Printf("InfluxDB write Error: %+v\n", err) - log.Printf("InfluxDB write Error: %+v\n", err) - return - } + c.Write(bp) } diff --git a/main.go b/main.go index 304e716..fa66fb1 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ import ( ) const ( - _Version = "v5.0.0b6" + _Version = "v5.0.0b2" _Producer = 0 _Consumer = 1 _Remover = 2 @@ -55,11 +55,8 @@ func main() { // re, _ := regexp.Compile(`(\w+)@(\d+.\d+.\d+.\d+:\d+)`) if re.MatchString(opts.Influxdb) { match := re.FindStringSubmatch(opts.Influxdb) - if opts.Debug { - fmt.Printf("Influxdb match: %+v\n", match) - } infhost = match[1] - infdb = match[2] + ":" + match[3] + infdb = match[2] } else { opts.Influxdb = "" }