improved logging

1 files changed, 21 insertions, 15 deletions

diff --git a/main.go b/main.go
index ac004de..71c1196 100644
--- a/main.go
+++ b/main.go
@@ -7,14 +7,20 @@ import (
 	"time"
 )
 
+var (
+	logger *log.Logger
+)
+
+func init() {
+	logger = log.New(os.Stdout, "[ Main ]", log.LstdFlags)
+}
+
 func main() {
-	log.Println("Reading config...")
 	cfg, err := readConfig()
 	if err != nil {
-		log.Println("Could not read config")
+		logger.Println("Could not read config")
 		return
 	}
-	log.Println("Done!")
 
 	switch cfg.DataSource {
 	case "stdin":
@@ -22,51 +28,51 @@ func main() {
 	case "mysq":
 		processFromDB(cfg)
 	default:
-		log.Println("Invalid dataSource in config. Needs to be either 'stdin' or 'mysql'.")
+		logger.Println("Invalid dataSource in config. Needs to be either 'stdin' or 'mysql'.")
 	}
 
-	log.Println("Finished processing, now exiting")
+	logger.Println("Finished processing, now exiting")
 }
 
 func processFromStdin(cfg *Config) {
-	log.Println("Starting to process from stdin...")
+	logger.Println("Starting to process from stdin...")
 	input := readFromStdin()
 	rDatChan := parseRawData(input, cfg)
 	cleanFromStdin(rDatChan, cfg)
 }
 
 func processFromDB(cfg *Config) {
-	log.Print("Cleaning data...")
+	logger.Print("Cleaning data...")
 	starttime := time.Now()
 	numOfRowsNotCleaned, err := cleanFromDB(cfg)
 	if err != nil {
-		log.Println(err)
-		log.Println("Exiting...")
+		logger.Println(err)
+		logger.Println("Exiting...")
 		return
 	}
-	log.Println("Done!")
+	logger.Println("Done!")
 
 	// If  either all rows are processed or if there is no limit for the processing
 	// we can safely add noise to the cleaned data
 	if (numOfRowsNotCleaned == 0 || cfg.Limit == 0) && cfg.Epsilon >= 0 {
-		log.Println("Adding differential privacy noise to processed data...")
+		logger.Println("Adding differential privacy noise to processed data...")
 		db, err := sql.Open("mysql", cfg.DBUser+":"+cfg.DBPass+"@"+cfg.DBConn+"/"+cfg.DBName)
 		if err != nil {
-			log.Println("Failed to connect to db:", err)
+			logger.Println("Failed to connect to db:", err)
 			return
 		}
 		defer db.Close()
 
 		ival, err := cfg.getInterval()
 		if err != nil {
-			log.Println("erronous interval in conf prevents the privatization of data:", err)
+			logger.Println("erronous interval in conf prevents the privatization of data:", err)
 			return
 		}
 
 		err = privatizeCleaned(db, starttime.Add(-2*ival), cfg)
 		if err != nil {
-			log.Println("Failed to privatize data:", err)
+			logger.Println("Failed to privatize data:", err)
 		}
-		log.Println("Done!")
+		logger.Println("Done!")
 	}
 }