修复分区配置初始化写入流程
将安装向导写入、域名设置和安装完成流程统一接入分区配置事务,保留旧版配置覆盖保护。
This commit is contained in:
1 parent
20e1007f83
commit
ef4e4c2ce6
6 files changed
+205
-7
No files matched your search
@@ -286,7 +286,7 @@ func SetDatabaseSettingsWithOptions(ctx *context.Context, settings DatabaseSetti
|
||||
markSetupInProgress(&candidateConfig)
|
||||
candidateConfig.DbType = dbType
|
||||
candidateConfig.DbDSN = dbDSN
|
||||
if err = config.WriteConfig(&candidateConfig); err != nil {
|
||||
if err = config.WriteSetupConfig(&candidateConfig); err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
if err = config.Init(); err != nil {
|
||||
@@ -685,7 +685,7 @@ func restoreDatabaseConfig(previous *config.Config) {
|
||||
return
|
||||
}
|
||||
closeDatabaseInstance()
|
||||
if err := config.WriteConfig(previous); err != nil {
|
||||
if err := config.WriteSetupConfig(previous); err != nil {
|
||||
return
|
||||
}
|
||||
_ = config.Init()
|
||||
|
||||
@@ -63,7 +63,7 @@ func setDomainSettings(smtpDomain, webDomain, multiDomains string, publicHTTPSPo
|
||||
|
||||
// 检查域名是否指向本机 todo
|
||||
|
||||
err = config.WriteConfig(configData)
|
||||
err = config.WriteSetupConfig(configData)
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ func Finish() error {
|
||||
portsChanged := applyServicePorts(cfg)
|
||||
if cfg.IsSetupReady() {
|
||||
if portsChanged {
|
||||
if err = config.WriteConfig(cfg); err != nil {
|
||||
if err = config.WriteSetupConfig(cfg); err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user