From 530d70a2d6363fb6eb6f8bfddf67ab7fc7b5f074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Gro=C3=9Fe=20Sundrup?=
 <jonas-git@grosse-sundrup.com>
Date: Sat, 30 Dec 2023 00:05:50 +0100
Subject: [PATCH] re-arrange for better maintainability

---
 main.go | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/main.go b/main.go
index 079a22e..ccf94a1 100644
--- a/main.go
+++ b/main.go
@@ -73,15 +73,7 @@ func main() {
 	if isSocketActivated {
 		l, err = net.FileListener(os.NewFile(3, "systemd-socket"))
 		fmt.Println("Listening on systemd-socket")
-	} else {
-		l, err = net.Listen("tcp", *CONN_HOST+":"+*CONN_PORT)
-		fmt.Println("Listening on " + *CONN_HOST + ":" + *CONN_PORT)
-	}
-	check(err)
-	defer l.Close() // Close the listener when the application closes.
 
-	for {
-		// Listen for an incoming connection.
 		conn, err := l.Accept()
 		if err != nil {
 			fmt.Println("Error accepting: ", err.Error())
@@ -93,11 +85,28 @@ func main() {
 			restartUISoftware()
 		}
 
-		if isSocketActivated {
-			break
-		}
+	} else {
+		l, err = net.Listen("tcp", *CONN_HOST+":"+*CONN_PORT)
+		fmt.Println("Listening on " + *CONN_HOST + ":" + *CONN_PORT)
 
+		for {
+			// Listen for an incoming connection.
+			conn, err := l.Accept()
+			if err != nil {
+				fmt.Println("Error accepting: ", err.Error())
+				os.Exit(1)
+			}
+			handleRequest(conn)
+
+			if *restart {
+				restartUISoftware()
+			}
+
+		}
 	}
+	check(err)
+	defer l.Close() // Close the listener when the application closes.
+
 }
 
 func debug(msg ...string) {