From c2a5e09323b501bd0c26b5b3022a7bb60696f97e Mon Sep 17 00:00:00 2001 From: miki Date: Wed, 5 Oct 2016 11:55:50 +0200 Subject: [PATCH] eliminati tutti i warning --- consumer.go | 8 ++++++-- counter.go | 17 +++++++++++++++++ dbs.go | 21 +++++++++++++-------- main.go | 4 ++-- options.go | 8 +++++--- pid.go | 8 +++----- producer.go | 2 +- 7 files changed, 47 insertions(+), 21 deletions(-) diff --git a/consumer.go b/consumer.go index ebe2c92..954f345 100644 --- a/consumer.go +++ b/consumer.go @@ -20,7 +20,7 @@ type consumed struct { func contains(s []Ips, e string) bool { for _, a := range s { - if a.Ip == e { + if a.IP == e { return true } } @@ -66,7 +66,7 @@ func consumer(id int) { ml := MongoLogin{ User: prod.user, Protocol: sval[0], - Ip: sval[2], + IP: sval[2], Date: time.Unix(date, 0), Insert: time.Now(), } @@ -95,6 +95,10 @@ func consumer(id int) { if opts.Debug { log.Printf("%+v\n", ml) } + // inserisce last timestamp su redis per consolidamento + /* + + */ } cons.logins = append(cons.logins, login) diff --git a/counter.go b/counter.go index 92f4ebc..952c04f 100644 --- a/counter.go +++ b/counter.go @@ -6,6 +6,7 @@ import ( "time" ) +// Counter structure type Counter struct { mu sync.Mutex user int @@ -17,6 +18,7 @@ type Counter struct { wg []int } +// NewCounter iniitialized Counter structure func NewCounter() *Counter { return &Counter{ user: 0, @@ -29,48 +31,56 @@ func NewCounter() *Counter { } } +// AddUser increment number of users managed func (c *Counter) AddUser() { c.mu.Lock() defer c.mu.Unlock() c.user++ } +// AddDuplicate increment number of duplicates log func (c *Counter) AddDuplicate() { c.mu.Lock() defer c.mu.Unlock() c.dup++ } +// AddLog increment number of log's rows managed func (c *Counter) AddLog(add int) { c.mu.Lock() defer c.mu.Unlock() c.log += add } +//AddRem increment removed logs row func (c *Counter) AddRem(add int) { c.mu.Lock() defer c.mu.Unlock() c.rem += add } +// AddWG ... func (c *Counter) AddWG(id int) { c.mu.Lock() defer c.mu.Unlock() c.wg[id]++ } +// AddErr ... func (c *Counter) AddErr() { c.mu.Lock() defer c.mu.Unlock() c.err++ } +// DelWG ... func (c *Counter) DelWG(id int) { c.mu.Lock() defer c.mu.Unlock() c.wg[id]-- } +// GetUser return total users func (c *Counter) GetUser() (ret int) { c.mu.Lock() defer c.mu.Unlock() @@ -78,6 +88,7 @@ func (c *Counter) GetUser() (ret int) { return } +// GetDup return total duplicated logins func (c *Counter) GetDup() (ret int) { c.mu.Lock() defer c.mu.Unlock() @@ -85,6 +96,7 @@ func (c *Counter) GetDup() (ret int) { return } +// GetLog return total log's rows func (c *Counter) GetLog() (ret int) { c.mu.Lock() defer c.mu.Unlock() @@ -92,6 +104,7 @@ func (c *Counter) GetLog() (ret int) { return } +// GetErr return total errors func (c *Counter) GetErr() (ret int) { c.mu.Lock() defer c.mu.Unlock() @@ -99,6 +112,7 @@ func (c *Counter) GetErr() (ret int) { return } +// GetRem return total removed log's rows func (c *Counter) GetRem() (ret int) { c.mu.Lock() defer c.mu.Unlock() @@ -106,6 +120,7 @@ func (c *Counter) GetRem() (ret int) { return } +// GetWG ... func (c *Counter) GetWG(id int) (ret int) { c.mu.Lock() defer c.mu.Unlock() @@ -113,6 +128,7 @@ func (c *Counter) GetWG(id int) (ret int) { return } +// GetTime ... func (c *Counter) GetTime() (ret float64) { c.mu.Lock() defer c.mu.Unlock() @@ -120,6 +136,7 @@ func (c *Counter) GetTime() (ret float64) { return } +// SetTime ... func (c *Counter) SetTime(t time.Duration) { c.mu.Lock() defer c.mu.Unlock() diff --git a/dbs.go b/dbs.go index c3da808..16c1924 100644 --- a/dbs.go +++ b/dbs.go @@ -14,40 +14,45 @@ import ( var ( dbs = Dbs{ - MongoUri: "mongodb://127.0.0.1:27018", - RedisUri: "127.0.0.1:6379", + MongoURI: "mongodb://127.0.0.1:27018", + RedisURI: "127.0.0.1:6379", Database: "lastlogin", } ) +// Dbs structure type Dbs struct { - MongoUri string + MongoURI string Database string - RedisUri string + RedisURI string rdb *redis.Pool //*redis.Client mdb *mgo.Session ll *mgo.Collection // us *mgo.Collection } +// MongoLogin structure type MongoLogin struct { User string `json:"user"` Protocol string `json:"protocol"` - Ip string `json:"ip"` + IP string `json:"ip"` Date time.Time `json:"date"` Insert time.Time `json:"insert"` } +// Ips structure type Ips struct { - Ip string `json:"ip"` + IP string `json:"ip"` } +// UserLogin structure type UserLogin struct { User string `json:"user"` Date time.Time `json:"date"` Lock bool `json:"lock"` } +// Index structure type Index struct { User string `json:"user"` Date time.Time `json:"date"` @@ -61,7 +66,7 @@ func (db *Dbs) poolRedis() { Wait: true, IdleTimeout: 1 * time.Second, Dial: func() (redis.Conn, error) { - c, err := redis.Dial("tcp", db.RedisUri) + c, err := redis.Dial("tcp", db.RedisURI) if err != nil { return nil, err } @@ -77,7 +82,7 @@ func (db *Dbs) poolRedis() { func (db *Dbs) connectMongo() { var err error - db.mdb, err = mgo.Dial(db.MongoUri) + db.mdb, err = mgo.Dial(db.MongoURI) if err != nil { log.Println("Mongodb connect Error: ", err.Error()) os.Exit(-3) diff --git a/main.go b/main.go index be29142..498c209 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( ) const ( - _VERSION = "v2.8.0" + _Version = "v2.8.0.1" ) var ( @@ -31,7 +31,7 @@ func main() { flag.Parse() if opts.Version { - fmt.Println(os.Args[0], _VERSION) + fmt.Println(os.Args[0], _Version) os.Exit(0) } diff --git a/options.go b/options.go index 9f4d726..43b6026 100644 --- a/options.go +++ b/options.go @@ -13,6 +13,7 @@ import ( "time" ) +// Options structure type Options struct { RedisTTL time.Duration CurrentPath string @@ -41,7 +42,8 @@ var ( ) func usage() { - fmt.Println("Usage: llmongo -m -r -t -l -b -T -x -H -i -v\n") + fmt.Println("Usage: llmongo -m -r -t -l -b -T -x -H -i -v") + fmt.Println() os.Exit(0) } @@ -59,9 +61,9 @@ func init() { flag.StringVar(&opts.Xymon, "x", "", "xymon server") flag.StringVar(&opts.Influxdb, "i", "", "influxdb server") flag.StringVar(&opts.Hostname, "H", "", "hostname") - flag.StringVar(&dbs.MongoUri, "m", dbs.MongoUri, "Mongodb") + 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(&dbs.RedisURI, "r", dbs.RedisURI, "Redis") flag.StringVar(&opts.LogFile, "l", opts.LogFile, "Logs filename") flag.IntVar(&opts.MaxLogins, "L", opts.MaxLogins, "Max lastlogins") flag.DurationVar(&opts.RedisTTL, "t", opts.RedisTTL, "Redis keys TTL") diff --git a/pid.go b/pid.go index 2533af2..5ccc2e5 100644 --- a/pid.go +++ b/pid.go @@ -16,6 +16,7 @@ var ( pid = PID{} ) +// PID structure type PID struct { PID string PIDFile string @@ -42,11 +43,8 @@ func (p *PID) readCmd() bool { return false } cmd := bytes.Trim(bcmd, "\x00") - if strings.Contains(string(cmd), opts.Exe) { - return true - } else { + if !strings.Contains(string(cmd), opts.Exe) { fmt.Printf("PID %s used by %s\n", pid, cmd) - return true } return true } @@ -78,7 +76,7 @@ func (p *PID) Write(l bool) { fpid.Close() } -// Cancella il PIDFile +// Remove cancella il PIDFile func (p *PID) Remove() { err := os.Remove(p.PIDFile) if err != nil { diff --git a/producer.go b/producer.go index 4d173e1..b913325 100644 --- a/producer.go +++ b/producer.go @@ -39,7 +39,7 @@ func producer(id int) { break } - // estrae tutti i login dell'utente "user" + // estrae login dell'utente "user" logs, err := redis.Strings(conn.Do("lrange", user, "1", strconv.Itoa(opts.MaxLogins))) if err != nil { if opts.Debug {