From 7c8bdb06706c1f6c88255d901405d0f7f1a11b37 Mon Sep 17 00:00:00 2001
From: jamesread <contact@jwread.com>
Date: Fri, 16 Jul 2021 22:45:46 +0100
Subject: [PATCH] Code cleanup for updates

---
 cmd/OliveTin/main.go                |  7 +++---
 internal/updatecheck/updateCheck.go | 34 +++++++++++++++++------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/cmd/OliveTin/main.go b/cmd/OliveTin/main.go
index ecf0151..e7c92fd 100644
--- a/cmd/OliveTin/main.go
+++ b/cmd/OliveTin/main.go
@@ -46,10 +46,6 @@ func init() {
 
 	reloadConfig()
 
-	if logLevel, err := log.ParseLevel(cfg.LogLevel); err == nil {
-		log.SetLevel(logLevel)
-	}
-
 	viper.WatchConfig()
 	viper.OnConfigChange(func(e fsnotify.Event) {
 		if e.Op == fsnotify.Write {
@@ -66,6 +62,9 @@ func reloadConfig() {
 		os.Exit(1)
 	}
 
+	if logLevel, err := log.ParseLevel(cfg.LogLevel); err == nil {
+		log.SetLevel(logLevel)
+	}
 }
 
 func main() {
diff --git a/internal/updatecheck/updateCheck.go b/internal/updatecheck/updateCheck.go
index 76da4cc..f4915ed 100644
--- a/internal/updatecheck/updateCheck.go
+++ b/internal/updatecheck/updateCheck.go
@@ -57,19 +57,12 @@ func StartUpdateChecker(currentVersion string, currentCommit string, cfg *config
 	s.StartAsync()
 }
 
-func actualCheckForUpdate(payload updateRequest) {
-	jsonUpdateRequest, err := json.Marshal(payload)
-
-	if err != nil {
-		log.Errorf("Update check failed %v", err)
-		return
-	}
-
+func doRequest(jsonUpdateRequest []byte) string {
 	req, err := http.NewRequest("POST", "http://update-check.olivetin.app", bytes.NewBuffer(jsonUpdateRequest))
 
 	if err != nil {
 		log.Errorf("Update check failed %v", err)
-		return
+		return ""
 	}
 
 	req.Header.Set("Content-Type", "application/json")
@@ -78,14 +71,27 @@ func actualCheckForUpdate(payload updateRequest) {
 
 	if err != nil {
 		log.Errorf("Update check failed %v", err)
-		return
+		return ""
 	}
 
 	newVersion, _ := ioutil.ReadAll(resp.Body)
 
-	log.WithFields(log.Fields{
-		"NewVersion": string(newVersion),
-	}).Infof("Update check complete")
-
 	defer resp.Body.Close()
+
+	return string(newVersion)
+}
+
+func actualCheckForUpdate(payload updateRequest) {
+	jsonUpdateRequest, err := json.Marshal(payload)
+
+	if err != nil {
+		log.Errorf("Update check failed %v", err)
+		return
+	}
+
+	newVersion := doRequest(jsonUpdateRequest)
+
+	log.WithFields(log.Fields{
+		"NewVersion": newVersion,
+	}).Infof("Update check complete")
 }