Compare commits
No commits in common. "master" and "5.0.0b2" have entirely different histories.
3 changed files with 7 additions and 25 deletions
|
@ -11,6 +11,5 @@ docker run \
|
||||||
-r 192.168.0.1:6379 \
|
-r 192.168.0.1:6379 \
|
||||||
-m 192.168.0.1:27017 \
|
-m 192.168.0.1:27017 \
|
||||||
-d lastlogin \
|
-d lastlogin \
|
||||||
-i test@10.39.253.206:8086 \
|
|
||||||
-T 80s \
|
-T 80s \
|
||||||
$@
|
$@
|
||||||
|
|
24
influxdb.go
24
influxdb.go
|
@ -3,7 +3,6 @@ package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
influxdb "github.com/influxdata/influxdb/client/v2"
|
influxdb "github.com/influxdata/influxdb/client/v2"
|
||||||
|
@ -16,8 +15,7 @@ var (
|
||||||
|
|
||||||
func writeStats(start time.Time) {
|
func writeStats(start time.Time) {
|
||||||
if opts.Debug {
|
if opts.Debug {
|
||||||
fmt.Printf("writing to influxdb server: %s\n", opts.Influxdb)
|
fmt.Printf("writing to influxdb server: %s", opts.Influxdb)
|
||||||
fmt.Printf("host: %s -- addr: %s\n", infhost, infdb)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
c, err := influxdb.NewHTTPClient(influxdb.HTTPConfig{
|
c, err := influxdb.NewHTTPClient(influxdb.HTTPConfig{
|
||||||
|
@ -25,8 +23,7 @@ func writeStats(start time.Time) {
|
||||||
Timeout: 2 * time.Second,
|
Timeout: 2 * time.Second,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("InfluxDB connect Error: %+v\n", err)
|
fmt.Printf("Error: %+v\n", err)
|
||||||
log.Printf("InfluxDB connect Error: %+v\n", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer c.Close()
|
defer c.Close()
|
||||||
|
@ -36,8 +33,7 @@ func writeStats(start time.Time) {
|
||||||
Precision: "s",
|
Precision: "s",
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("InfluxDB batch Error: %+v\n", err)
|
fmt.Printf("Error: %+v\n", err)
|
||||||
log.Printf("InfluxDB batch Error: %+v\n", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,22 +48,12 @@ func writeStats(start time.Time) {
|
||||||
}
|
}
|
||||||
pt, err := influxdb.NewPoint("ll2mongo", tags, fields, start)
|
pt, err := influxdb.NewPoint("ll2mongo", tags, fields, start)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("InfluxDB point Error: %+v\n", err)
|
fmt.Printf("Error: %+v\n", err)
|
||||||
log.Printf("InfluxDB point Error: %+v\n", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if opts.Debug {
|
|
||||||
fmt.Printf("InfluxDB pt: %+v\n", pt)
|
|
||||||
}
|
|
||||||
|
|
||||||
bp.AddPoint(pt)
|
bp.AddPoint(pt)
|
||||||
|
|
||||||
// Write the batch
|
// Write the batch
|
||||||
err = c.Write(bp)
|
c.Write(bp)
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("InfluxDB write Error: %+v\n", err)
|
|
||||||
log.Printf("InfluxDB write Error: %+v\n", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
7
main.go
7
main.go
|
@ -14,7 +14,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
_Version = "v5.0.0b6"
|
_Version = "v5.0.0b2"
|
||||||
_Producer = 0
|
_Producer = 0
|
||||||
_Consumer = 1
|
_Consumer = 1
|
||||||
_Remover = 2
|
_Remover = 2
|
||||||
|
@ -55,11 +55,8 @@ func main() {
|
||||||
// re, _ := regexp.Compile(`(\w+)@(\d+.\d+.\d+.\d+:\d+)`)
|
// re, _ := regexp.Compile(`(\w+)@(\d+.\d+.\d+.\d+:\d+)`)
|
||||||
if re.MatchString(opts.Influxdb) {
|
if re.MatchString(opts.Influxdb) {
|
||||||
match := re.FindStringSubmatch(opts.Influxdb)
|
match := re.FindStringSubmatch(opts.Influxdb)
|
||||||
if opts.Debug {
|
|
||||||
fmt.Printf("Influxdb match: %+v\n", match)
|
|
||||||
}
|
|
||||||
infhost = match[1]
|
infhost = match[1]
|
||||||
infdb = match[2] + ":" + match[3]
|
infdb = match[2]
|
||||||
} else {
|
} else {
|
||||||
opts.Influxdb = ""
|
opts.Influxdb = ""
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue