From e968c82c2105c8b58db2270d731a0b85face6982 Mon Sep 17 00:00:00 2001 From: Miki Date: Mon, 16 May 2016 16:03:23 +0200 Subject: [PATCH] aggiunto come opzione il nome del Database di destinazione --- dbs.go | 5 ++++- main.go | 2 +- options.go | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dbs.go b/dbs.go index f212c33..c3da808 100644 --- a/dbs.go +++ b/dbs.go @@ -16,11 +16,13 @@ var ( dbs = Dbs{ MongoUri: "mongodb://127.0.0.1:27018", RedisUri: "127.0.0.1:6379", + Database: "lastlogin", } ) type Dbs struct { MongoUri string + Database string RedisUri string rdb *redis.Pool //*redis.Client mdb *mgo.Session @@ -80,5 +82,6 @@ func (db *Dbs) connectMongo() { log.Println("Mongodb connect Error: ", err.Error()) os.Exit(-3) } - db.ll = db.mdb.DB("lastlogin").C(fmt.Sprintf("lastlogin_%s", opts.Month)) + + db.ll = db.mdb.DB(db.Database).C(fmt.Sprintf("lastlogin_%s", opts.Month)) } diff --git a/main.go b/main.go index cbf31e0..98671c6 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( ) const ( - _VERSION = "v2.7.1" + _VERSION = "v2.7.2" ) var ( diff --git a/options.go b/options.go index 3d049cd..18f483e 100644 --- a/options.go +++ b/options.go @@ -50,6 +50,7 @@ func init() { flag.StringVar(&opts.Influxdb, "i", "", "influxdb server") flag.StringVar(&opts.Hostname, "H", "", "hostname") flag.StringVar(&dbs.MongoUri, "m", dbs.MongoUri, "Mongodb") + flag.StringVar(&dbs.Database, "d", dbs.Database, "Mongodb Database") flag.StringVar(&dbs.RedisUri, "r", dbs.RedisUri, "Redis") flag.StringVar(&opts.LogFile, "l", opts.LogFile, "Logs filename") flag.DurationVar(&opts.RedisTTL, "t", opts.RedisTTL, "Redis keys TTL")