From b97098e78bc8bf6fc50b4ebc993d500a8a3ec87a Mon Sep 17 00:00:00 2001
From: Miki <mikif70@gmail.com>
Date: Mon, 9 May 2016 12:10:27 +0200
Subject: [PATCH] usa la collection: lastlogin.lastlogin_yymm

---
 dbs.go                   |  4 ++--
 lastlogin_consolidate.go | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dbs.go b/dbs.go
index 6b6b65b..5330be7 100644
--- a/dbs.go
+++ b/dbs.go
@@ -54,7 +54,7 @@ type Users struct {
 	Logins []IPs  `json:"logins" bson:"logins"`
 }
 
-func connectMongo() {
+func connectMongo(data string) {
 
 	if opts.MongoSrc == "" {
 		log.Fatalf("Mongodb URI invalid: '%s'\n", opts.MongoSrc)
@@ -67,7 +67,7 @@ func connectMongo() {
 		os.Exit(-3)
 	}
 	dbs.mdbSrc.SetSocketTimeout(0)
-	dbs.ll = dbs.mdbSrc.DB("dovecot").C("lastlogin")
+	dbs.ll = dbs.mdbSrc.DB("lastlogin").C("lastlogin_" + data)
 
 	if opts.MongoDst == "" {
 		dbs.mdbDst = dbs.mdbSrc
diff --git a/lastlogin_consolidate.go b/lastlogin_consolidate.go
index 6605749..6a757cf 100644
--- a/lastlogin_consolidate.go
+++ b/lastlogin_consolidate.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	_VERSION = "v1.3.7"
+	_VERSION = "v1.4.0"
 	_tformat = "2006-01-02"
 	_24h     = (time.Hour * 23) + (time.Minute * 59) + (time.Second * 59) + (time.Millisecond * 999)
 	_10m     = (time.Minute * 10)
@@ -74,24 +74,22 @@ func main() {
 	fmt.Printf("Start: %+v\n", opts)
 	log.Printf("Start: %+v\n", opts)
 
-	connectMongo()
-	defer dbs.mdbSrc.Close()
-	defer dbs.mdbDst.Close()
-
 	y, err := time.Parse(_tformat, opts.StartDate)
 	if err != nil {
 		log.Println("Date Error: ", err)
 		os.Exit(-1)
 	}
-
 	var ys time.Time
 	var ye time.Time
 
 	ys = time.Date(y.Year(), y.Month(), y.Day(), 0, 0, 0, 0, time.UTC)
 	ye = ys.Add(opts.Duration)
-
 	idb = Influxdb(start, ys)
 
+	connectMongo(ys.Format("0601"))
+	defer dbs.mdbSrc.Close()
+	defer dbs.mdbDst.Close()
+
 	// DEBUG
 	if opts.Debug {
 		fmt.Printf("Start: %+v, Stop: %+v\n\r", ys, ye)