From 559e7f72b3940573b02d3dce4789524a99059bc3 Mon Sep 17 00:00:00 2001
From: Marcel Otte <otte.mm@googlemail.com>
Date: Mon, 10 Oct 2022 23:11:02 +0200
Subject: [PATCH] Fix retrying ui connection

---
 ui/ui_main.go | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/ui/ui_main.go b/ui/ui_main.go
index e7eae5f..5bdaf11 100644
--- a/ui/ui_main.go
+++ b/ui/ui_main.go
@@ -58,34 +58,39 @@ func PollConnection() {
 			log.Println("Creating connection")
 			c, err = net.Dial("unix", config.Settings.UIUnixSocketLocation)
 		} // else already connected
+		// receive msgs
+		if c != nil && err == nil {
+			data := make([]byte, 2048)
+			nr, err := c.Read(data)
+			log.Printf("Read %d bytes...", nr)
+			if err != nil {
+				log.Printf("Error reading data from socket: %s", err)
+				c = nil
+			}
+			if err == nil {
+				sdata := string(bytes.Trim(data, "\x00"))
+				var message map[string]string
+				log.Printf("Reading JSON: %s", sdata)
+				errjson := json.Unmarshal([]byte(sdata), &message)
+				if errjson != nil {
+					err = errjson
+					log.Printf("Error parsing json: %s", errjson)
+					c = nil
+				}
+				if errjson == nil {
+					ShowNotification(message)
+				}
+			}
+		}
 		// handle error on connection
 		if err != nil {
-			log.Println(err)
+			log.Printf("Error during communication: %s", err)
 			// ignore
 			err = nil
 			c = nil
 			// sleep a while and then retry
 			time.Sleep(10 * time.Second)
 		}
-		// receive msgs
-		if c != nil {
-			data := make([]byte, 2048)
-			nr, err := c.Read(data)
-			log.Printf("Read %d bytes...", nr)
-			if err != nil {
-				log.Println(err)
-				break
-			}
-			sdata := string(bytes.Trim(data, "\x00"))
-			var message map[string]string
-			log.Printf("Reading JSON: %s", sdata)
-			errjson := json.Unmarshal([]byte(sdata), &message)
-			if errjson != nil {
-				log.Println(errjson)
-				continue
-			}
-			ShowNotification(message)
-		}
 	}
 }