mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chore: prepare v2.0.0-beta.37

Browse source
This commit is contained in:
Jacky 2024-10-26 13:00:52 +08:00
parent 6dc6092bfc
commit c8c0446308
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
15 changed files with 75 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
settings/server_v1.go
View file

@ -100,7 +100,7 @@ func mergeStructs(src, dst interface{}) {
return
}
func Migrate(confPath string) {
func migrate(confPath string) {
logger.Init("debug")
Conf, err := ini.LoadSources(ini.LoadOptions{
Loose: true,
@ -160,7 +160,7 @@ func Migrate(confPath string) {
for name, ptr := range migrated.Iterator() {
err = Conf.Section(name).MapTo(ptr)
if err != nil {
logger.Error("Migrate.MapTo %s err: %v", name, err)
logger.Error("migrate.MapTo %s err: %v", name, err)
}
}
@ -187,7 +187,7 @@ func Migrate(confPath string) {
for section, ptr := range migrated.Iterator() {
err = Conf.Section(section).ReflectFrom(ptr)
if err != nil {
logger.Fatalf("Migrate.ReflectFrom %s err: %v", section, err)
logger.Fatalf("migrate.ReflectFrom %s err: %v", section, err)
}
}

2
settings/server_v1_test.go
View file

@ -121,5 +121,5 @@ RPOrigins = http://localhost:3002,http://127.0.0.1:3002`
t.Fatalf("Failed to write config to file: %v", err)
}
Migrate(confName)
migrate(confName)
}

11
settings/settings.go
View file

@ -64,7 +64,16 @@ func init() {
settings.WithoutSonyflake()
}
func Init() {
func Init(confPath string) {
migrate(confPath)
settings.Init(confPath)
// Set Default Port
if settings.ServerSettings.Port == 0 {
settings.ServerSettings.Port = 9000
}
for prefix, ptr := range envPrefixMap {
parseEnv(ptr, prefix+"_")
}