From aed817f021caf842a8594e5902b0d9e048d348ed Mon Sep 17 00:00:00 2001
From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:53:55 +0900
Subject: [PATCH] Fix MQTT connection and error handling

---
 backend/state-manager/pkg/mqtt_handler/mqtt_handler.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/state-manager/pkg/mqtt_handler/mqtt_handler.go b/backend/state-manager/pkg/mqtt_handler/mqtt_handler.go
index 2ae89e9..84b6918 100644
--- a/backend/state-manager/pkg/mqtt_handler/mqtt_handler.go
+++ b/backend/state-manager/pkg/mqtt_handler/mqtt_handler.go
@@ -24,7 +24,6 @@ func NewHandler(clientOpts *mqtt.ClientOptions, dbHandler *db.DBHandler) (*Handl
 
 	if token := cc.Connect(); token.Wait() && token.Error() != nil {
 		return nil, fmt.Errorf("mqtt error: %w", token.Error())
-		return nil, fmt.Errorf("mqtt error: %w", token.Error())
 	}
 	return &Handler{client: cc, dbHandler: dbHandler}, nil
 }
@@ -149,12 +148,12 @@ func (h *Handler) getState(ctx context.Context, target string, id string) error
 			// Return error message
 			token := h.client.Publish("setting/"+id+"/get/accepted", 0, false, "error")
 			token.Wait()
-			return
+			return fmt.Errorf("setting file not found: %w", err)
 		}
 		raw, err := os.ReadFile("../settings/esp/" + id + ".json")
 		if err != nil {
-			log.Println(err.Error())
-			return
+			slog.Default().Error("setting file read error", slog.Any("err", err))
+			return fmt.Errorf("setting file read error: %w", err)
 		}
 		// remove \n code
 		raw = []byte(strings.Replace(string(raw), "\n", "", -1))