Browse Source

conditional blocking on version server response

reid 2 năm trước cách đây
mục cha
commit
a7c12d795d
3 tập tin đã thay đổi với 7 bổ sung7 xóa
  1. 1 1
      config/version.go
  2. 2 2
      defaults/version.go
  3. 4 4
      main.go

+ 1 - 1
config/version.go

@@ -127,4 +127,4 @@ func CreateDefaultVersion() error {
 		return err
 	}
 	return nil
-}
+}

+ 2 - 2
defaults/version.go

@@ -3,13 +3,13 @@ package defaults
 import (
 	"encoding/json"
 	"fmt"
-	"os"
 	"goseg/structs"
 	"log/slog"
+	"os"
 )
 
 var (
-	logger      = slog.New(slog.NewJSONHandler(os.Stdout, nil))
+	logger             = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 	DefaultVersionText = `{
 		"groundseg": {
 		  "canary": {

+ 4 - 4
main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"fmt"
 	"encoding/json"
+	"fmt"
 	"goseg/config"
 	"goseg/docker"
 	"goseg/rectify"
@@ -10,10 +10,10 @@ import (
 	"goseg/ws"
 	"io/ioutil"
 	"log/slog"
-	"path/filepath"
 	"net/http"
 	"os"
-	"time"
+	"path/filepath"
+	// "time"
 
 	"github.com/gorilla/mux"
 )
@@ -65,7 +65,7 @@ func main() {
 			}
 			versionUpdateChannel <- versionUpdate
 		}()
-	// otherwise use cached if possible, or save hardcoded defaults and use that
+		// otherwise use cached if possible, or save hardcoded defaults and use that
 	} else {
 		confPath := filepath.Join(config.BasePath, "settings", "version_info.json")
 		_, err := os.Open(confPath)