consul.go

@@ -1,44 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-)
-
-// Consul client structure
-type Consul struct {
-	RedisTTL  time.Duration
-	Timeout   time.Duration
-	MaxError  int
-	Influxdb  string
-	Month     string
-	Retention float64
-	MongoURI  string
-	Database  string
-	RedisURI  string
-	Client    *api.Client
-}
-
-// NewClient New consul client
-func NewClient() *Consul {
-	client, err := api.NewClient(api.DefaultConfig())
-	if err != nil {
-		log.Fatalf("Consul error: %+v\n", err)
-		if opts.Debug {
-			fmt.Printf("Consul error: %+v\n", err)
-		}
-	}
-
-	consul := &Consul{
-		Client:   client,
-		RedisTTL: opts.RedisTTL,
-		Timeout:  opts.Timeout,
-		MaxError: opts.MaxError,
-		Influxdb: opts.Influxdb,
-	}
-
-	return consul
-}

consumer.go

@@ -12,8 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/globalsign/mgo"
-	//	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2"
 )
 
 type consumed struct {
@@ -140,7 +139,7 @@ func consumer() {
 								tipo: "err",
 								val:  len(prod.logins),
 							}
-							if opts.Test || opts.Debug {
+							if opts.Test {
 								log.Printf("ERR: %s - %+v\n", prod.user, prod.logins)
 							}
 							continue
@@ -149,18 +148,17 @@ func consumer() {
 								tipo: "dup",
 								val:  strings.Count(err.Error(), "E11000"),
 							}
-							if opts.Debug {
-								log.Printf("DUP: %s - %+v\n", prod.user, prod.logins)
-							}
 						}
 					} else {
 						if opts.Test {
 							log.Printf("OK: %s - %+v\n", prod.user, prod.logins)
+						}
+						if opts.Debug {
 							log.Printf("BulkResult: %s - %+v\n", prod.user, result)
 						}
 						counter <- Counterchan{
 							tipo: "ins",
-							val:  len(allLogins),
+							val:  len(prod.logins),
 						}
 					}
 				}

counter.go

@@ -6,7 +6,6 @@ import (
 	"time"
 )
 
-// Counterchan counter structure
 type Counterchan struct {
 	tipo string
 	val  int
@@ -39,7 +38,6 @@ func NewCounter() *Counter {
 	}
 }
 
-// Run open channel to receive counter
 func (c *Counter) Run() {
 	for {
 		tocount := <-counter

dbs.go

@@ -10,8 +10,7 @@ import (
 
 	"github.com/garyburd/redigo/redis"
 
-	"github.com/globalsign/mgo"
-	//	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2"
 )
 
 var (

docker-compose/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   mongodb:
-    image: mikif70/mongodb:3.6.9
+    image: mikif70/mongodb:3.4.7
     ports:
       - 27017:27017
     container_name: ll_mongod
@@ -15,4 +15,4 @@ services:
     ports:
       - 6379:6379
     volumes:
-      - ./redis:/data
+      - ./redis:/data

docker-compose/mongo.sh

@@ -6,4 +6,4 @@ else
         HOST=${1}
 fi
 
-docker run --rm -it mikif70/mongotools:3.6.9 mongo ${HOST}
+docker run --rm -it mikif70/mongotools:3.4.7 mongo ${HOST}

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 \
                 $@

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)
 }

main.go

@@ -14,7 +14,7 @@ import (
 )
 
 const (
-	_Version  = "v5.0.0b6"
+	_Version  = "v4.4.5b1"
 	_Producer = 0
 	_Consumer = 1
 	_Remover  = 2
@@ -51,15 +51,11 @@ func main() {
 	}
 
 	if opts.Influxdb != "" {
-		var re = regexp.MustCompile(`(?m)(\w+)@([\w.]+):(\d+)`)
-		//		re, _ := regexp.Compile(`(\w+)@(\d+.\d+.\d+.\d+:\d+)`)
+		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 = ""
 		}

mongo_scripts.txt

@@ -1,34 +0,0 @@
-
-################
-var dd = function(x) { var s = x.toString(); if(s.length > 1){return s;} else { return "0"+s;}}
-
-for (var i=1; i<18; i++) { 
-	var col = "ll_1806"+dd(i); 
-	print(col); 
-	db.getCollection(col).createIndex({date: -1}, {expireAfterSeconds: 15552000, name: "expire", background: true}); 
-}
-
-###########
-var dd = function(x) { var s = x.toString(); if(s.length > 1){return s;} else { return "0"+s;}}
-
-for (var m=1; m<=12; m++) { 
-	for (var d=1; d<=31; d++) { 
-		var col = "ll_15"+dd(m)+dd(d); 
-		if (db.getCollection(col).exists != null) {
-			print(col); 
-			print(db.getCollection(col).totalSize()); 			
-		}
-	}
-}
-
-
-####
-var ar = db.getCollectionNames()
-var len = ar.length
-
-for (var i=0; i<len; i++) { if (ar[i].startsWith("ll")) { print(db.getCollection(ar[i]))}}
-
-
-####
-db.lastlogin_1703.createIndex({date: -1}, {expireAfterSeconds: 15552000, name: "expire", background: true})
-

options.go

@@ -1,3 +1,4 @@
+// options
 package main
 
 import (
@@ -26,8 +27,6 @@ type Options struct {
 	Month       string
 	Queue       int
 	Retention   float64
-	Consul      string
-	Port        int
 }
 
 var (
@@ -41,13 +40,11 @@ func usage() {
 	fmt.Println(`Usage: llmongo 
 		-m <mongodb [ip:port,ip:port]> 
 		-d <mongodb database [dbname]>
-		-r <redisdb [ip:port]>
+		-r <redisdb [ip:port]> 
 		-t <redis keys ttl> 
 		-l <logfile> 
 		-T <running timeout> 
-		-i <influxdb [localname@ip:port]>
-		-C <consul [ip:port]>
-		-P <check port> [port] ## used by consul to check services ##
+		-i <influxdb [localname@ip:port]>	
 		-q <parallel consumer>
 		-R <retention>
 		-v <version>
@@ -72,8 +69,6 @@ func init() {
 	flag.StringVar(&dbs.Database, "d", "", "Mongodb Database")
 	flag.StringVar(&dbs.RedisURI, "r", "", "Redis")
 	flag.StringVar(&opts.LogFile, "l", opts.LogFile, "Logs filename")
-	flag.StringVar(&opts.Consul, "C", opts.Consul, "consul client")
-	flag.IntVar(&opts.Port, "P", 10500, "service check port")
 	flag.DurationVar(&opts.RedisTTL, "t", opts.RedisTTL, "Redis keys TTL")
 	flag.BoolVar(&opts.Version, "v", false, "Version")
 	flag.DurationVar(&opts.Timeout, "T", 0, "Running timeout")