goal: avoid "node successfully started" on a previously started node (a…

…lgorand#2075)

When starting a node which is already started, two messages are show: already started and successfully started:

$ goal node start
Algorand node was already started!
Algorand node successfully started!

Only the already started message should be shown.

Also, when node restart command is given, there is a check in the code if the node was already running.
This check comes after the node was stopped, so should never return as the node is still running. But in case it does, a message is added to notify the user.

cmd/goal/messages.go

@@ -58,6 +58,7 @@ const (
 	// Node
 	infoNodeStart                     = "Algorand node successfully started!"
 	infoNodeAlreadyStarted            = "Algorand node was already started!"
+	infoNodeDidNotRestart             = "Algorand node did not restart. The node is still running!"
 	infoTryingToStopNode              = "Trying to stop the node..."
 	infoNodeShuttingDown              = "Algorand node is shutting down..."
 	infoNodeSuccessfullyStopped       = "The node was successfully stopped."

cmd/goal/node.go

@@ -182,14 +182,14 @@ var startCmd = &cobra.Command{
 			}
 
 			algodAlreadyRunning, err := nc.StartAlgod(nodeArgs)
-			if algodAlreadyRunning {
-				reportInfoln(infoNodeAlreadyStarted)
-			}
-
 			if err != nil {
 				reportErrorf(errorNodeFailedToStart, err)
 			} else {
-				reportInfoln(infoNodeStart)
+				if algodAlreadyRunning {
+					reportInfoln(infoNodeAlreadyStarted)
+				} else {
+					reportInfoln(infoNodeStart)
+				}
 			}
 		})
 	},
@@ -304,14 +304,15 @@ var restartCmd = &cobra.Command{
 			}
 
 			algodAlreadyRunning, err := nc.StartAlgod(nodeArgs)
-			if algodAlreadyRunning {
-				reportInfoln(infoNodeAlreadyStarted)
-			}
-
 			if err != nil {
 				reportErrorf(errorNodeFailedToStart, err)
 			} else {
-				reportInfoln(infoNodeStart)
+				if algodAlreadyRunning {
+					// This can never happen. In case it does, report about it.
+					reportInfoln(infoNodeDidNotRestart)
+				} else {
+					reportInfoln(infoNodeStart)
+				}
 			}
 		})
 	},

test/e2e-go/cli/goal/expect/goalNodeTest.exp

@@ -30,6 +30,23 @@ if { [catch {
     # Start node
     ::AlgorandGoal::StartNode $TEST_PRIMARY_NODE_DIR
 
+    # Try starting the node again, should just report the node is already running
+    set ALREADY_STARTED_MESSAGE_RECEIVED 0
+    spawn goal node start -d $TEST_PRIMARY_NODE_DIR
+    expect {
+        timeout { close; ::AlgorandGoal::Abort "goal node start unexpectedly failed" }
+        "^Algorand node was already started!" {
+	    set ALREADY_STARTED_MESSAGE_RECEIVED 1
+	    exp_continue
+	}
+	-re "\\S+" { close; ::AlgorandGoal::Abort "Unexpected message for goal node start on a running node" }
+        eof {
+	    if {$ALREADY_STARTED_MESSAGE_RECEIVED == 0} {
+		{ close; ::AlgorandGoal::Abort "eof recieved before the expected message "}
+	    }
+	}
+    }
+
     # Restart node
     ::AlgorandGoal::RestartNode $TEST_PRIMARY_NODE_DIR