reid 2 лет назад
Родитель
Сommit
2dba8b2b3b
2 измененных файлов с 31 добавлено и 11 удалено
  1. 30 10
      config/config.go
  2. 1 1
      main.go

+ 30 - 10
config/config.go

@@ -17,7 +17,7 @@ import (
 var (
 	globalConfig       structs.SysConfig
 	logger             = slog.New(slog.NewJSONHandler(os.Stdout, nil))
-	basePath           = "/home/nativeplanet/gits"
+	basePath           = "/home/reid/gits/np/goseg"
 	Version            = "v2.0.0"
 	Ready              = false
 	VersionServerReady = false
@@ -40,14 +40,16 @@ func init() {
 	if err != nil {
 		err = createDefaultConf()
 		if err != nil {
-			logger.Error("Unable to create config!")
+			errmsg := fmt.Sprintf("Unable to create config! %v", err)
+			logger.Error(errmsg)
 		}
 	}
 	defer file.Close()
 	decoder := json.NewDecoder(file)
 	err = decoder.Decode(&globalConfig)
 	if err != nil {
-		logger.Error("Error decoding JSON: %v", err)
+		errmsg := fmt.Sprintf("Error decoding JSON: %v", err)
+		logger.Error(errmsg)
 	}
 }
 
@@ -61,12 +63,14 @@ func UpdateConf(values map[string]interface{}) error {
 	confPath := filepath.Join(basePath, "settings", "system2.json")
 	file, err := ioutil.ReadFile(confPath)
 	if err != nil {
-		logger.Error("Unable to load config")
+		errmsg := fmt.Sprintf("Unable to load config: %v", err)
+		logger.Error(errmsg)
 		return err
 	}
 	var configMap map[string]interface{}
 	if err := json.Unmarshal(file, &configMap); err != nil {
-		logger.Error("Error decoding JSON: %v", err)
+		errmsg := fmt.Sprintf("Error decoding JSON: %v", err)
+		logger.Error(errmsg)
 		return err
 	}
 	for key, value := range values {
@@ -74,15 +78,18 @@ func UpdateConf(values map[string]interface{}) error {
 	}
 	updatedJSON, err := json.Marshal(configMap)
 	if err != nil {
-		logger.Error("Error encoding JSON: %v", err)
+		errmsg := fmt.Sprintf("Error encoding JSON: %v", err)
+		logger.Error(errmsg)
 		return err
 	}
 	if err := json.Unmarshal(updatedJSON, &globalConfig); err != nil {
-		logger.Error("Error updating global config: %v", err)
+		errmsg := fmt.Sprintf("Error updating global config: %v", err)
+		logger.Error(errmsg)
 		return err
 	}
 	if err := ioutil.WriteFile(confPath, updatedJSON, 0644); err != nil {
-		logger.Error("Error writing to file: %v", err)
+		errmsg := fmt.Sprintf("Error writing to file: %v", err)
+		logger.Error(errmsg)
 		return err
 	}
 	return nil
@@ -154,11 +161,11 @@ func NetCheck(netCheck string) bool {
 	timeout := 3 * time.Second
 	conn, err := net.DialTimeout("tcp", netCheck, timeout)
 	if err != nil {
-		logger.Error("Check internet access error: %v\n", err)
+		errmsg := fmt.Sprintf("Check internet access error: %v", err)
+		logger.Error(errmsg)
 	} else {
 		internet = true
 		_ = conn.Close()
-		logger.Info("Internet connection is available!")
 	}
 	return internet
 }
@@ -202,6 +209,19 @@ func CheckVersion() (structs.Version, bool) {
 				return VersionInfo, false
 			}
 		}
+		confPath := filepath.Join(basePath, "settings", "version_info.json")
+		file, err := os.Create(confPath)
+		if err != nil {
+			errmsg := fmt.Sprintf("Failed to create file: %v", err)
+			logger.Error(errmsg)
+			return VersionInfo, false
+		}
+		defer file.Close()
+		encoder := json.NewEncoder(file)
+		if err := encoder.Encode(&VersionInfo); err != nil {
+			errmsg := fmt.Sprintf("Failed to write JSON: %v", err)
+			logger.Error(errmsg)
+		}
 		fmt.Println(VersionInfo)
 		return VersionInfo, true
 	}

+ 1 - 1
main.go

@@ -23,7 +23,7 @@ func main() {
 	internetAvailable := config.NetCheck("1.1.1.1:53")
 	availMsg := fmt.Sprintf("Internet available: %t", internetAvailable)
 	logger.Info(availMsg)
-	versionUpdateChannel := make(chan bool)
+	// versionUpdateChannel := make(chan bool)
 	if conf.UpdateMode == "auto" {
 		go func() {
 			versionInfo, versionUpdate := config.CheckVersion()