|
@@ -4,11 +4,11 @@ import (
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
"errors"
|
|
"errors"
|
|
|
"os"
|
|
"os"
|
|
|
- "path/filepath"
|
|
|
|
|
"strings"
|
|
"strings"
|
|
|
"sync"
|
|
"sync"
|
|
|
|
|
|
|
|
"hnyfkj.com.cn/rtu/linux/baseapp"
|
|
"hnyfkj.com.cn/rtu/linux/baseapp"
|
|
|
|
|
+ "hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
type ServerConfig struct {
|
|
type ServerConfig struct {
|
|
@@ -96,32 +96,6 @@ const defaultConfig = `{
|
|
|
]
|
|
]
|
|
|
}`
|
|
}`
|
|
|
|
|
|
|
|
-func writeFileAtomic(path string, data []byte) error {
|
|
|
|
|
- tmp, err := os.CreateTemp(filepath.Dir(path), "."+filepath.Base(path)+".tmp-*")
|
|
|
|
|
- if err != nil {
|
|
|
|
|
- return err
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- tmpPath := tmp.Name()
|
|
|
|
|
- defer os.Remove(tmpPath)
|
|
|
|
|
-
|
|
|
|
|
- if _, err := tmp.Write(data); err != nil {
|
|
|
|
|
- tmp.Close()
|
|
|
|
|
- return err
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- if err := tmp.Sync(); err != nil {
|
|
|
|
|
- tmp.Close()
|
|
|
|
|
- return err
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- if err := tmp.Close(); err != nil {
|
|
|
|
|
- return err
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- return os.Rename(tmpPath, path)
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
func LoadServerConfig(path, id string) (*ServerConfig, error) {
|
|
func LoadServerConfig(path, id string) (*ServerConfig, error) {
|
|
|
if strings.TrimSpace(id) == "" {
|
|
if strings.TrimSpace(id) == "" {
|
|
|
return nil, errors.New("device id is empty")
|
|
return nil, errors.New("device id is empty")
|
|
@@ -143,7 +117,7 @@ func LoadServerConfig(path, id string) (*ServerConfig, error) {
|
|
|
|
|
|
|
|
if useDefault {
|
|
if useDefault {
|
|
|
data = []byte(defaultConfig)
|
|
data = []byte(defaultConfig)
|
|
|
- if err := writeFileAtomic(path, append(data, '\n')); err != nil {
|
|
|
|
|
|
|
+ if err := utils.WriteFileAtomic(path, append(data, '\n')); err != nil {
|
|
|
baseapp.Logger.Warnf("[%s] 保存默认配置文件失败: %v!", MODULE_NAME, err)
|
|
baseapp.Logger.Warnf("[%s] 保存默认配置文件失败: %v!", MODULE_NAME, err)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -188,7 +162,7 @@ func (c *ServerConfig) Save(path string) error {
|
|
|
return err
|
|
return err
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- return writeFileAtomic(path, append(data, '\n'))
|
|
|
|
|
|
|
+ return utils.WriteFileAtomic(path, append(data, '\n'))
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (c *ServerConfig) GetMQTSServers() []MQTTServer {
|
|
func (c *ServerConfig) GetMQTSServers() []MQTTServer {
|