|
@@ -74,17 +74,20 @@ func InitCloudConfig() {
|
|
// 获取文件的目录
|
|
// 获取文件的目录
|
|
_ = util.CreateParentDir(LocalConfig.CloudConfigLocalPath)
|
|
_ = util.CreateParentDir(LocalConfig.CloudConfigLocalPath)
|
|
// 3 ------- 获取 yaml 字符串 -------
|
|
// 3 ------- 获取 yaml 字符串 -------
|
|
- var content []byte
|
|
|
|
cloudConfigObjectKey := LocalConfig.OssBasePrefix + LocalConfig.EquipmentNo + "/" + LocalConfig.CloudConfigFilename
|
|
cloudConfigObjectKey := LocalConfig.OssBasePrefix + LocalConfig.EquipmentNo + "/" + LocalConfig.CloudConfigFilename
|
|
- OssMutex.Lock()
|
|
|
|
- err := OssBucket.GetObjectToFile(cloudConfigObjectKey, LocalConfig.CloudConfigLocalPath)
|
|
|
|
- OssMutex.Unlock()
|
|
|
|
- if err != nil {
|
|
|
|
- c_log.GlobalLogger.Error("程序崩溃,下载oss上的配置文件"+cloudConfigObjectKey+"失败。", err)
|
|
|
|
- os.Exit(-1)
|
|
|
|
|
|
+ for {
|
|
|
|
+ time.Sleep(time.Duration(2) * time.Second)
|
|
|
|
+ OssMutex.Lock()
|
|
|
|
+ err := OssBucket.GetObjectToFile(cloudConfigObjectKey, LocalConfig.CloudConfigLocalPath)
|
|
|
|
+ OssMutex.Unlock()
|
|
|
|
+ if err != nil {
|
|
|
|
+ c_log.GlobalLogger.Error("下载 OSS 上的配置文件 "+cloudConfigObjectKey+" 失败,请尽快在 OSS 上传配置文件。", err)
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
|
|
+ break
|
|
}
|
|
}
|
|
|
|
|
|
- content, err = os.ReadFile(LocalConfig.CloudConfigLocalPath)
|
|
|
|
|
|
+ content, err := os.ReadFile(LocalConfig.CloudConfigLocalPath)
|
|
if err != nil {
|
|
if err != nil {
|
|
c_log.GlobalLogger.Error("程序崩溃,配置文件 ", LocalConfig.CloudConfigLocalPath, " 读取失败:", err)
|
|
c_log.GlobalLogger.Error("程序崩溃,配置文件 ", LocalConfig.CloudConfigLocalPath, " 读取失败:", err)
|
|
os.Exit(-1)
|
|
os.Exit(-1)
|