From dd76e61e4462eace53af3f7b3408626601b77690 Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Tue, 23 Jun 2020 00:05:26 +0100
Subject: [PATCH] Make the ports have default values

---
 cmd/rove-accountant/main.go        | 15 +++++++++------
 cmd/rove-reverse-proxy/main.go     | 15 +++++++++------
 cmd/rove-server/internal/server.go |  2 +-
 cmd/rove-server/main.go            | 15 +++++++++------
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/cmd/rove-accountant/main.go b/cmd/rove-accountant/main.go
index ff5036d..31f2914 100644
--- a/cmd/rove-accountant/main.go
+++ b/cmd/rove-accountant/main.go
@@ -82,14 +82,17 @@ func (a *accountantServer) GetValue(_ context.Context, in *accounts.DataKey) (*a
 
 // main
 func main() {
-	// Verify the input
+	// Get the port
+	var iport int
 	var port = os.Getenv("PORT")
 	if len(port) == 0 {
-		log.Fatal("Must set $PORT")
-	}
-	iport, err := strconv.Atoi(port)
-	if err != nil {
-		log.Fatal("$PORT not valid int")
+		iport = 9091
+	} else {
+		var err error
+		iport, err = strconv.Atoi(port)
+		if err != nil {
+			log.Fatal("$PORT not valid int")
+		}
 	}
 
 	persistence.SetPath(data)
diff --git a/cmd/rove-reverse-proxy/main.go b/cmd/rove-reverse-proxy/main.go
index eaedc69..06653b6 100644
--- a/cmd/rove-reverse-proxy/main.go
+++ b/cmd/rove-reverse-proxy/main.go
@@ -21,16 +21,19 @@ func main() {
 
 	var endpoint = os.Getenv("ROVE_GRPC")
 	if len(endpoint) == 0 {
-		log.Fatal("Must set $ROVE_GRPC")
+		endpoint = "localhost:9090"
 	}
 
+	var iport int
 	var port = os.Getenv("PORT")
 	if len(port) == 0 {
-		log.Fatal("Must set $PORT")
-	}
-	iport, err := strconv.Atoi(port)
-	if err != nil {
-		log.Fatal("$PORT not valid int")
+		iport = 8080
+	} else {
+		var err error
+		iport, err = strconv.Atoi(port)
+		if err != nil {
+			log.Fatal("$PORT not valid int")
+		}
 	}
 
 	// Create a new mux and register it with the gRPC endpoint
diff --git a/cmd/rove-server/internal/server.go b/cmd/rove-server/internal/server.go
index dc3500e..449d9e2 100644
--- a/cmd/rove-server/internal/server.go
+++ b/cmd/rove-server/internal/server.go
@@ -106,7 +106,7 @@ func (s *Server) Initialise(fillWorld bool) (err error) {
 	// Connect to the accountant
 	accountantAddress := os.Getenv("ROVE_ACCOUNTANT_GRPC")
 	if len(accountantAddress) == 0 {
-		log.Fatal("must set $ROVE_ACCOUNTANT_GRPC")
+		accountantAddress = "localhost:9091"
 	}
 	log.Printf("Dialing accountant on %s\n", accountantAddress)
 	s.clientConn, err = grpc.Dial(accountantAddress, grpc.WithInsecure())
diff --git a/cmd/rove-server/main.go b/cmd/rove-server/main.go
index 83ec280..d2848b2 100644
--- a/cmd/rove-server/main.go
+++ b/cmd/rove-server/main.go
@@ -31,14 +31,17 @@ func InnerMain() {
 		return
 	}
 
-	// Address to host the server on, automatically selected if empty
+	// Address to host the server on
+	var iport int
 	var port = os.Getenv("PORT")
 	if len(port) == 0 {
-		log.Fatal("Must set $PORT")
-	}
-	iport, err := strconv.Atoi(port)
-	if err != nil {
-		log.Fatal("$PORT not valid int")
+		iport = 9090
+	} else {
+		var err error
+		iport, err = strconv.Atoi(port)
+		if err != nil {
+			log.Fatal("$PORT not valid int")
+		}
 	}
 	log.Printf("Initialising version %s...\n", version.Version)