added logging and other useful checks

1 files changed, 18 insertions, 4 deletions

diff --git a/main.go b/main.go
index 027867a..65b314e 100644
--- a/main.go
+++ b/main.go
@@ -18,11 +18,13 @@ const (
 )
 
 func main() {
+	log.Println("Reading config...")
 	conf, err := readConfig()
 	if err != nil {
 		log.Println("Could not read config")
 		return
 	}
+	log.Println("Done!")
 
 	/*
 		stdin := readFromStdin()
@@ -33,28 +35,40 @@ func main() {
 			}
 		}
 	*/
+	log.Print("Cleaning data...")
 	starttime := time.Now()
 	numOfRowsNotCleaned, err := cleanData(conf, DATABASE_USER, DATABASE_PASS, DATABASE_CONNECTION, DATABASE_NAME)
 	if err != nil {
 		log.Println(err)
+		log.Println("Exiting...")
+		return
 	}
+	log.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 || conf.Limit == 0 {
+	if (numOfRowsNotCleaned == 0 || conf.Limit == 0) && conf.Epsilon >= 0 {
+		log.Println("Adding differential privacy noise to processed data...")
 		db, err := sql.Open("mysql", DATABASE_USER+":"+DATABASE_PASS+"@"+DATABASE_CONNECTION+"/"+DATABASE_NAME)
 		if err != nil {
-			log.Println("Failed to connect to db")
+			log.Println("Failed to connect to db:", err)
 			return
 		}
 		defer db.Close()
+
 		ival, err := conf.getInterval()
 		if err != nil {
-			log.Println("erronous interval in conf prevents the privatization of data")
+			log.Println("erronous interval in conf prevents the privatization of data:", err)
 			return
 		}
-		privatizeCleaned(db, starttime.Add(-2*ival), conf)
+
+		err = privatizeCleaned(db, starttime.Add(-2*ival), conf)
+		if err != nil {
+			log.Println("Failed to privatize data:", err)
+		}
+		log.Println("Done!")
 	}
+	log.Println("Finished processing, now exiting")
 }
 
 //Starts a process that reads from stdin and