Removed the log.Fatal(s) from the app/

Author: JoaoAndreSa

app/client.go

@@ -27,12 +27,14 @@ func startQuery(el *onet.Roster, proofs bool, sum []string, count bool, whereQue
 
 	surveyID, err := client.SendSurveyCreationQuery(el, servicesunlynx.SurveyID(""), nil, nbrDPs, proofs, true, sum, count, whereQueryValues, predicate, groupBy)
 	if err != nil {
-		log.Fatal("Service did not start.", err)
+		log.Error("Service did not start.", err)
+		return
 	}
 
 	grp, aggr, err := client.SendSurveyResultsQuery(*surveyID)
 	if err != nil {
-		log.Fatal("Service could not output the results.", err)
+		log.Error("Service could not output the results.", err)
+		return
 	}
 
 	// Print Output
@@ -44,7 +46,7 @@ func startQuery(el *onet.Roster, proofs bool, sum []string, count bool, whereQue
 	}
 }
 
-func runUnLynx(c *cli.Context) error {
+func runUnLynx(c *cli.Context) {
 	tomlFileName := c.String("file")
 
 	proofs := c.Bool("proofs")
@@ -58,13 +60,19 @@ func runUnLynx(c *cli.Context) error {
 
 	el, err := openGroupToml(tomlFileName)
 	if err != nil {
-		return err
+		log.Error("Could not open group toml:", err)
+		return
+	}
+
+	sumFinal, countFinal, whereFinal, predicateFinal, groupByFinal, err := parseQuery(el, sum, count, whereQueryValues, predicate, groupBy)
+	if err != nil {
+		log.Error(err)
+		return
 	}
 
-	sumFinal, countFinal, whereFinal, predicateFinal, groupByFinal := parseQuery(el, sum, count, whereQueryValues, predicate, groupBy)
 	startQuery(el, proofs, sumFinal, countFinal, whereFinal, predicateFinal, groupByFinal)
 
-	return nil
+	return
 }
 
 func openGroupToml(tomlFileName string) (*onet.Roster, error) {
@@ -84,27 +92,24 @@ func openGroupToml(tomlFileName string) (*onet.Roster, error) {
 	return el.Roster, nil
 }
 
-func checkRegex(input, expression, errorMessage string) {
+func checkRegex(input, expression string) bool{
 	var aux = regexp.MustCompile(expression)
-
-	correct := aux.MatchString(input)
-
-	if !correct {
-		log.Fatal(errorMessage)
-	}
+	return aux.MatchString(input)
 }
 
-func parseQuery(el *onet.Roster, sum string, count bool, where, predicate, groupBy string) ([]string, bool, []libunlynx.WhereQueryAttribute, string, []string) {
+func parseQuery(el *onet.Roster, sum string, count bool, where, predicate, groupBy string) ([]string, bool, []libunlynx.WhereQueryAttribute, string, []string, error) {
 
 	if sum == "" || (where != "" && predicate == "") || (where == "" && predicate != "") {
-		log.Fatal("Wrong query! Please check the sum, where and the predicate parameters")
+		return nil, false, nil, "", nil, errors.New("Wrong query! Please check the sum, where and the predicate parameters")
 	}
 
 	sumRegex := "{s[0-9]+(,\\s*s[0-9]+)*}"
 	whereRegex := "{(w[0-9]+(,\\s*[0-9]+))*(,\\s*w[0-9]+(,\\s*[0-9]+))*}"
 	groupByRegex := "{g[0-9]+(,\\s*g[0-9]+)*}"
 
-	checkRegex(sum, sumRegex, "Error parsing the sum parameter(s)")
+	if !checkRegex(sum, sumRegex) {
+		return nil, false, nil, "", nil, errors.New("Error parsing the sum parameter(s)")
+	}
 	sum = strings.Replace(sum, " ", "", -1)
 	sum = strings.Replace(sum, "{", "", -1)
 	sum = strings.Replace(sum, "}", "", -1)
@@ -119,11 +124,13 @@ func parseQuery(el *onet.Roster, sum string, count bool, where, predicate, group
 		}
 
 		if !check {
-			log.Fatal("No 'count' attribute in the sum variables")
+			return nil, false, nil, "", nil, errors.New("No 'count' attribute in the sum variables")
 		}
 	}
 
-	checkRegex(where, whereRegex, "Error parsing the where parameter(s)")
+	if !checkRegex(where, whereRegex) {
+		return nil, false, nil, "", nil, errors.New("Error parsing the where parameter(s)")
+	}
 	where = strings.Replace(where, " ", "", -1)
 	where = strings.Replace(where, "{", "", -1)
 	where = strings.Replace(where, "}", "", -1)
@@ -139,20 +146,22 @@ func parseQuery(el *onet.Roster, sum string, count bool, where, predicate, group
 		} else { // if it is a value
 			value, err := strconv.Atoi(tmp[i])
 			if err != nil {
-				log.Fatal(err)
+				return nil, false, nil, "", nil, err
 			}
 
 			whereFinal = append(whereFinal, libunlynx.WhereQueryAttribute{Name: variable, Value: *libunlynx.EncryptInt(el.Aggregate, int64(value))})
 		}
 	}
 
-	checkRegex(groupBy, groupByRegex, "Error parsing the groupBy parameter(s)")
+	if !checkRegex(groupBy, groupByRegex) {
+		return nil, false, nil, "", nil, errors.New("Error parsing the groupBy parameter(s)")
+	}
 	groupBy = strings.Replace(groupBy, " ", "", -1)
 	groupBy = strings.Replace(groupBy, "{", "", -1)
 	groupBy = strings.Replace(groupBy, "}", "", -1)
 	groupByFinal := strings.Split(groupBy, ",")
 
-	return sumFinal, count, whereFinal, predicate, groupByFinal
+	return sumFinal, count, whereFinal, predicate, groupByFinal, nil
 }
 
 // CLIENT END: QUERIER ----------

app/unlynx.go

@@ -3,6 +3,7 @@ package appunlynx
 import (
 	"os"
 
+	"github.com/btcsuite/goleveldb/leveldb/errors"
 	"github.com/lca1/unlynx/lib"
 	"go.dedis.ch/onet/v3/app"
 	"go.dedis.ch/onet/v3/log"
@@ -122,7 +123,7 @@ func main() {
 			Usage: "Start unlynx server",
 			Action: func(c *cli.Context) error {
 				if err := runServer(c); err != nil {
-					log.Fatal("Error during runServer():", err)
+					return errors.New("Error during runServer():" + err.Error())
 				}
 				return nil
 			},
@@ -134,10 +135,10 @@ func main() {
 					Usage:   "Setup server configuration (interactive)",
 					Action: func(c *cli.Context) error {
 						if c.String(optionConfig) != "" {
-							log.Fatal("[-] Configuration file option cannot be used for the 'setup' command")
+							return errors.New("[-] Configuration file option cannot be used for the 'setup' command")
 						}
 						if c.GlobalIsSet("debug") {
-							log.Fatal("[-] Debug option cannot be used for the 'setup' command")
+							return errors.New("[-] Debug option cannot be used for the 'setup' command")
 						}
 						app.InteractiveConfig(libunlynx.SuiTe, BinaryName)
 						return nil