From 6c3ffa7c7be07fe9be5688ff9e32b471b7648f19 Mon Sep 17 00:00:00 2001
From: Miki <mikif70@gmail.com>
Date: Tue, 24 Nov 2015 16:18:39 +0100
Subject: [PATCH] modificato l'output del log

---
 consumer.go |  4 ++--
 main.go     |  2 +-
 producer.go | 20 ++++++++++----------
 remover.go  |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/consumer.go b/consumer.go
index 4df52a1..86f47e3 100644
--- a/consumer.go
+++ b/consumer.go
@@ -108,8 +108,8 @@ func consumer(id int) {
 		count.AddLog(len(prod.logins))
 
 		if opts.Debug {
-			fmt.Printf("CONS (%d): user=%s logins=%d in %v - active=%d\n\r", id, prod.user, len(prod.logins), time.Since(start), dbs.rdb.ActiveCount())
-			//			log.Printf("CONS (%d): user=%s logins=%d in %v - active=%d\n\r", id, prod.user, len(prod.logins), time.Since(start), dbs.rdb.ActiveCount())
+			fmt.Printf("CONS (%d): user=%s logins=%d in %v - active=%d\n", id, prod.user, len(prod.logins), time.Since(start), dbs.rdb.ActiveCount())
+			//			log.Printf("CONS (%d): user=%s logins=%d in %v - active=%d\n", id, prod.user, len(prod.logins), time.Since(start), dbs.rdb.ActiveCount())
 		}
 
 		remove[id] <- cons
diff --git a/main.go b/main.go
index 6b9d926..105a555 100644
--- a/main.go
+++ b/main.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	_VERSION = "v2.2.5"
+	_VERSION = "v2.2.6"
 )
 
 var (
diff --git a/producer.go b/producer.go
index 067c6bf..982889f 100644
--- a/producer.go
+++ b/producer.go
@@ -23,15 +23,15 @@ func producer(id int) {
 		// estrae un userid dalla lista degli utenti che hanno fatto login
 		user, err := redis.String(conn.Do("spop", "llindex"))
 		//		if opts.Debug {
-		//			log.Printf("SPOP: %+v - %+v\n\r", user, err)
-		//			fmt.Printf("SPOP: %+v - %+v\n\r", user, err)
+		//			log.Printf("SPOP: %+v - %+v\n", user, err)
+		//			fmt.Printf("SPOP: %+v - %+v\n", user, err)
 		//		}
 		// se non ci sono piu' userid esce
 		if err != nil {
 			if opts.Debug {
-				fmt.Printf("LLINDEX empty: %v\n\r", err)
+				fmt.Printf("LLINDEX empty: %v\n", err)
 			}
-			log.Printf("LLINDEX empty: %v\n\r", err)
+			log.Printf("LLINDEX empty: %v\n", err)
 			//loop[id] = false
 			//done[id] <- true
 			break
@@ -41,18 +41,18 @@ func producer(id int) {
 		logs, err := redis.Strings(conn.Do("lrange", user, "0", "-1"))
 		if err != nil {
 			if opts.Debug {
-				fmt.Printf("LRANGE: %+v - %+v\n\r", err, logs)
+				fmt.Printf("LRANGE: %+v - %+v\n", err, logs)
 			}
-			log.Printf("LRANGE: %+v - %+v\n\r", err, logs)
+			log.Printf("LRANGE: %+v - %+v\n", err, logs)
 		}
 		//		if opts.Debug {
-		//			fmt.Printf("LRANGE: %s - %d\n\r", user, len(logs))
-		//			log.Printf("LRANGE: %s - %d\n\r", user, len(logs))
+		//			fmt.Printf("LRANGE: %s - %d\n", user, len(logs))
+		//			log.Printf("LRANGE: %s - %d\n", user, len(logs))
 		//		}
 
 		if opts.Debug {
-			fmt.Printf("PROD (%d): user=%s login=%d in %v - conn=%d\n\r", id, user, len(logs), time.Since(start), dbs.rdb.ActiveCount())
-			//			log.Printf("PROD (%d): user=%s login=%d in %v - conn=%d\n\r", id, user, len(logs), time.Since(start), dbs.rdb.ActiveCount())
+			fmt.Printf("PROD (%d): user=%s login=%d in %v - conn=%d\n", id, user, len(logs), time.Since(start), dbs.rdb.ActiveCount())
+			//			log.Printf("PROD (%d): user=%s login=%d in %v - conn=%d\n", id, user, len(logs), time.Since(start), dbs.rdb.ActiveCount())
 		}
 
 		count.AddUser()
diff --git a/remover.go b/remover.go
index 74f53ca..dffbac6 100644
--- a/remover.go
+++ b/remover.go
@@ -35,7 +35,7 @@ func remover(id int) {
 		conn.Flush()
 		count.AddRem(len(rem.logins))
 		if opts.Debug {
-			fmt.Printf("LREM (%d): %s - %d - %+v\n\r", id, rem.user, len(rem.logins), time.Since(start))
+			fmt.Printf("LREM (%d): %s - %d - %+v\n", id, rem.user, len(rem.logins), time.Since(start))
 		}
 		wg.Done()
 		count.RemWG(id)