From 565656544043e71567d1a0db38f36b618a6be86f Mon Sep 17 00:00:00 2001 From: Miki Date: Wed, 25 Nov 2015 09:05:14 +0100 Subject: [PATCH] inserisce tutti i docs su mongo. --- consumer.go | 54 +++++++++++++++++++++++++++-------------------------- main.go | 2 +- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/consumer.go b/consumer.go index 9b22cd5..2b4afd7 100644 --- a/consumer.go +++ b/consumer.go @@ -4,7 +4,7 @@ package main import ( "fmt" // "github.com/garyburd/redigo/redis" - "gopkg.in/mgo.v2/bson" + // "gopkg.in/mgo.v2/bson" "log" "strconv" "strings" @@ -83,33 +83,35 @@ func consumer(id int) { Date: time.Unix(date, 0), } // cerca se esiste gia' un documento con gli stessi User & Date - docfind := []Ips{} - iter := dbs.ll.Find(bson.M{"user": prod.user, "date": time.Unix(date, 0)}).Select(bson.M{"ip": 1, "_id": 0}).Iter() - iter.All(&docfind) - if len(docfind) > 0 { - count.AddDuplicate() - if !contains(docfind, ml.Ip) { - fmt.Printf("Insert != IP for same date: user=%s - date=%s\n - newip=%s - oldip=%s\n", ml.User, ml.Date, docfind, ml.Ip) - // inserisce il login su Mongodb se gli IP sono != - err := dbs.ll.Insert(ml) - if err != nil { - log.Printf("Insert error: %+v - %s\n", err, cons.user) - count.AddErr() - cons.error = true - continue + /* + docfind := []Ips{} + iter := dbs.ll.Find(bson.M{"user": prod.user, "date": time.Unix(date, 0)}).Select(bson.M{"ip": 1, "_id": 0}).Iter() + iter.All(&docfind) + if len(docfind) > 0 { + count.AddDuplicate() + if !contains(docfind, ml.Ip) { + fmt.Printf("Insert != IP for same date: user=%s - date=%s\n - newip=%s - oldip=%s\n", ml.User, ml.Date, docfind, ml.Ip) + // inserisce il login su Mongodb se gli IP sono != + err := dbs.ll.Insert(ml) + if err != nil { + log.Printf("Insert error: %+v - %s\n", err, cons.user) + count.AddErr() + cons.error = true + continue + } } - } - } else { - // inserisce il login su Mongodb - err := dbs.ll.Insert(ml) - if err != nil { - log.Printf("Insert error: %+v - %s\n", err, cons.user) - count.AddErr() - cons.error = true - continue - } + } else { + */ + // inserisce il login su Mongodb + err = dbs.ll.Insert(ml) + if err != nil { + log.Printf("Insert error: %+v - %s\n", err, cons.user) + count.AddErr() + cons.error = true + continue } - iter.Close() + // } + // iter.Close() if opts.Debug { log.Printf("%+v - %+v\n", ml) diff --git a/main.go b/main.go index 3aff306..8f86956 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( ) const ( - _VERSION = "v2.3.0" + _VERSION = "v2.3.1" ) var (