From e478395d8eed83d0b0eaee6d6e010d6b2a841acd Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 14 Feb 2021 00:11:52 -0600
Subject: [PATCH] Make RCON optional

---
 factorio-site.go     | 30 ++++++++++++++++--------------
 templates/index.html |  2 ++
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/factorio-site.go b/factorio-site.go
index dfd25d0..669f00e 100644
--- a/factorio-site.go
+++ b/factorio-site.go
@@ -27,7 +27,7 @@ type config struct {
 type server struct {
 	Host           string `json:"host"` // for display only
 	Port           int    `json:"port"`
-	RCONHost       string `json:"rconhost"` // not displayed, but used to connect
+	RCONHost       string `json:"rconhost"` // not displayed, but used to connect; leave blank for no RCON connection
 	RCONPort       int    `json:"rconport"`
 	RCONPassword   string `json:"rconpassword"`
 	Title          string `json:"title"`       // TODO: get this from RCON?
@@ -94,28 +94,30 @@ func main() {
 	// Connect to RCON servers
 	for i := range config.Servers {
 		s := config.Servers[i]
-		config.Servers[i].rconConnection, err = rcon.Dial(fmt.Sprintf("%v:%v", s.RCONHost, s.RCONPort), s.RCONPassword)
-		if err != nil {
-			log.Fatalf("Error making RCON connection to %v: %v", s.Title, err)
+		if s.RCONHost != "" {
+			config.Servers[i].rconConnection, err = rcon.Dial(fmt.Sprintf("%v:%v", s.RCONHost, s.RCONPort), s.RCONPassword)
+			if err != nil {
+				log.Fatalf("Error making RCON connection to %v: %v", s.Title, err)
+			}
+			defer config.Servers[i].rconConnection.Close()
 		}
-		defer config.Servers[i].rconConnection.Close()
 	}
 
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 
 		// Update servers with current data
 		for i, s := range config.Servers {
+			if s.rconConnection != nil {
+				config.Servers[i].Players, err = s.rconCommand("/players o")
+				if err != nil {
+					log.Printf("Error executing players online command: %v\n", err)
+				}
 
-			config.Servers[i].Players, err = s.rconCommand("/players o")
-			if err != nil {
-				log.Printf("Error executing players online command: %v\n", err)
+				config.Servers[i].Version, err = s.rconCommand("/version")
+				if err != nil {
+					log.Printf("Error executing version command: %v\n", err)
+				}
 			}
-
-			config.Servers[i].Version, err = s.rconCommand("/version")
-			if err != nil {
-				log.Printf("Error executing version command: %v\n", err)
-			}
-
 		}
 
 		err = t.Execute(w, data)
diff --git a/templates/index.html b/templates/index.html
index 7e815b5..efb9475 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -34,8 +34,10 @@
             <ul>
                 <li><b>Description:</b> {{.Description}}</li>
                 <li><b>Connection String:</b> {{.Host}}{{if ne .Port 34197}}:{{.Port}}{{end}}</li>
+                {{if ne .RCONHost ""}}
                 <li><b>Version:</b> {{.Version}}</li>
                 <li><b>Current players:</b><br>{{.Players}}</li>
+                {{end}}
             </ul>
         {{end}}
         <p class="light">This page maintained by chandlerswift's <a href="https://github.com/chandlerswift/factorio-site">factorio server list</a>.</p>