feat: move (re)dial inside monitor loop, to cover server bounces

Author: jlucktay

cmd/monitor.go

@@ -5,16 +5,17 @@ import (
 	"time"
 
 	"cloud.google.com/go/logging"
-	rcon "github.com/gtaylor/factorio-rcon"
 )
 
-func monitor(r *rcon.RCON, logger *logging.Logger, cfg configMonitor) {
+func monitor(logger *logging.Logger, cfg config) {
 	// Keep track of how long the server has been empty for
 	emptySince := time.Now().UTC()
 
 	// Main monitoring loop
 	for {
-		time.Sleep(cfg.MonitorInterval)
+		time.Sleep(cfg.Monitor.MonitorInterval)
+
+		r := dialAndAuth(logger, cfg.RCON)
 
 		players, errCP := r.CmdPlayers()
 		if errCP != nil {
@@ -26,6 +27,8 @@ func monitor(r *rcon.RCON, logger *logging.Logger, cfg configMonitor) {
 			continue
 		}
 
+		r.Close()
+
 		logger.Log(logging.Entry{
 			Payload:  fmt.Sprintf("%+v", players),
 			Severity: logging.Info,
@@ -49,9 +52,9 @@ func monitor(r *rcon.RCON, logger *logging.Logger, cfg configMonitor) {
 			})
 		}
 
-		if emptySince.Add(cfg.MonitorLimit).Before(time.Now().UTC()) {
+		if emptySince.Add(cfg.Monitor.MonitorLimit).Before(time.Now().UTC()) {
 			logger.Log(logging.Entry{
-				Payload:  fmt.Sprintf("Threshold reached; %s elapsed without any online players", cfg.MonitorLimit),
+				Payload:  fmt.Sprintf("Threshold reached; %s elapsed without any online players", cfg.Monitor.MonitorLimit),
 				Severity: logging.Notice,
 			})
 

cmd/password.go

@@ -9,7 +9,7 @@ import (
 	"cloud.google.com/go/logging"
 )
 
-// mustGetPassword prepares the RCON password.
+// mustGetPassword fetches the RCON password.
 func mustGetPassword(l *logging.Logger) string {
 	bPassword, errRF := ioutil.ReadFile("/opt/factorio/config/rconpw")
 	if errRF != nil {

cmd/rcon.go

@@ -24,6 +24,11 @@ func dialAndAuth(logger *logging.Logger, cfg configRcon) *rcon.RCON {
 
 	var r *rcon.RCON
 
+	logger.Log(logging.Entry{
+		Payload:  fmt.Sprintf("Dialling '%s' and authing...", rconAddress),
+		Severity: logging.Notice,
+	})
+
 	// Set placeholder errors before going into loop
 	errDial, errAuth := errPlaceholder, errPlaceholder
 
@@ -50,5 +55,10 @@ func dialAndAuth(logger *logging.Logger, cfg configRcon) *rcon.RCON {
 		}
 	}
 
+	logger.Log(logging.Entry{
+		Payload:  "Online!",
+		Severity: logging.Notice,
+	})
+
 	return r
 }

cmd/root.go

@@ -75,13 +75,9 @@ func Run(_ []string, _ io.Writer) error {
 	}
 
 	notice.Printf("Configuration loaded:\n%s", spew.Sdump(cfg))
-	notice.Printf("Dialling '%s' and authing...", rconAddress)
 
 	// Main loop
-	r := dialAndAuth(logger, cfg.RCON)
-	defer r.Close()
-	notice.Print("Online!")
-	monitor(r, logger, cfg.Monitor)
+	monitor(logger, cfg)
 
 	// Server seppuku
 	cmd := exec.Command("shutdown", "--poweroff", "now")