diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 67eeacb..cf96102 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mongodb: - image: mikif70/mongodb:3.4.7 + image: mikif70/mongodb:3.6.9 ports: - 27017:27017 container_name: ll_mongod @@ -15,4 +15,4 @@ services: ports: - 6379:6379 volumes: - - ./redis:/data \ No newline at end of file + - ./redis:/data diff --git a/docker-compose/mongo.sh b/docker-compose/mongo.sh index 4c17756..e7fadef 100755 --- a/docker-compose/mongo.sh +++ b/docker-compose/mongo.sh @@ -6,4 +6,4 @@ else HOST=${1} fi -docker run --rm -it mikif70/mongotools:3.4.7 mongo ${HOST} +docker run --rm -it mikif70/mongotools:3.6.9 mongo ${HOST} diff --git a/main.go b/main.go index 0fa9a6c..fa66fb1 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ import ( ) const ( - _Version = "v5.0.0b1" + _Version = "v5.0.0b2" _Producer = 0 _Consumer = 1 _Remover = 2 @@ -51,7 +51,8 @@ func main() { } if opts.Influxdb != "" { - re, _ := regexp.Compile(`(\w+)@(\d+.\d+.\d+.\d+:\d+)`) + var re = regexp.MustCompile(`(?m)(\w+)@([\w.]+):(\d+)`) + // re, _ := regexp.Compile(`(\w+)@(\d+.\d+.\d+.\d+:\d+)`) if re.MatchString(opts.Influxdb) { match := re.FindStringSubmatch(opts.Influxdb) infhost = match[1]