Code cleanup for updates

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() {

internal/updatecheck/updateCheck.go

@@ -57,35 +57,41 @@ func StartUpdateChecker(currentVersion string, currentCommit string, cfg *config
 	s.StartAsync()
 }
 
-func actualCheckForUpdate(payload updateRequest) {
-	jsonUpdateRequest, err := json.Marshal(payload)
+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, err := http.NewRequest("POST", "http://update-check.olivetin.app", bytes.NewBuffer(jsonUpdateRequest))
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := http.DefaultClient.Do(req)
 
 	if err != nil {
 		log.Errorf("Update check failed %v", err)
-		return
+		return ""
 	}
 
-	req.Header.Set("Content-Type", "application/json")
+	newVersion, _ := ioutil.ReadAll(resp.Body)
 
-	resp, err := http.DefaultClient.Do(req)
+	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, _ := ioutil.ReadAll(resp.Body)
+	newVersion := doRequest(jsonUpdateRequest)
 
 	log.WithFields(log.Fields{
-		"NewVersion": string(newVersion),
+		"NewVersion": newVersion,
 	}).Infof("Update check complete")
-
-	defer resp.Body.Close()
 }