diff --git a/lastlogin_consolidate.go b/lastlogin_consolidate.go index deb511e..18935cd 100644 --- a/lastlogin_consolidate.go +++ b/lastlogin_consolidate.go @@ -14,7 +14,7 @@ import ( ) const ( - _VERSION = "v1.0" + _VERSION = "v1.0.1" _tformat = "2006-01-02" _24h = (time.Hour * 23) + (time.Minute * 59) + (time.Second * 59) _10m = (time.Minute * 10) @@ -22,8 +22,8 @@ const ( var ( opts = Options{ - // MongoSrc: "mongodb://10.39.81.85:27018", - LogFile: "log/llmongo.log", + MongoSrc: "mongodb://127.0.0.1:27018", + LogFile: "log/llconsolidate.log", StartDate: time.Now().Add(-24 * time.Hour).Format(_tformat), Duration: _24h, Interval: _10m, @@ -141,7 +141,6 @@ func main() { } log.SetOutput(fs) - // log.SetPrefix("[llmongo] ") start := time.Now() fmt.Printf("Start: %+v\n", opts) @@ -153,11 +152,11 @@ func main() { y, err := time.Parse(_tformat, opts.StartDate) if err != nil { - fmt.Println("Date Error: ", err) + log.Println("Date Error: ", err) os.Exit(-1) } - fmt.Println(y) + // fmt.Println(y) var ys []time.Time var ye []time.Time @@ -167,9 +166,9 @@ func main() { ye = append(ye, ys[0].Add(opts.Duration)) } else { for i := 0; i < int(opts.Duration/(time.Hour*24)); i++ { - fmt.Println(i) + // fmt.Println(i) yt := y.Add(time.Hour * time.Duration(24*i)) - fmt.Println(yt) + // fmt.Println(yt) ys = append(ys, time.Date(yt.Year(), yt.Month(), yt.Day(), 0, 0, 0, 0, time.UTC)) ye = append(ye, ys[i].Add(_24h)) } @@ -184,12 +183,13 @@ func main() { q.Distinct("user", &ar) fmt.Printf("Date: %s - %s\n", ys[i], ye[i]) + log.Printf("Date: %s - %s\n", ys[i], ye[i]) for u := range ar { ll := LastLoginDay{} ll.User = ar[u] ll.Date = ys[i] - fmt.Println(ar[u]) + // fmt.Println(ar[u]) nq := opts.ll.Find(bson.M{"date": bson.M{"$gte": ys[i], "$lte": ye[i]}, "user": ar[u]}).Sort("date") iter := nq.Iter() result := LastLogin{} @@ -213,15 +213,16 @@ func main() { } } if err := iter.Close(); err != nil { - fmt.Println("Iter: ", err) + log.Println("Iter: ", err) } ll.IPs = ips _, err := opts.lc.Upsert(Index{User: ll.User, Date: ll.Date}, ll) if err != nil { - fmt.Println("Insert error: ", err) + log.Println("Insert error: ", err) } } } fmt.Println("Stop: ", time.Since(start)) + log.Println("Stop: ", time.Since(start)) }