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

feat: use settings file to predefine nodes #169

Browse source
This commit is contained in:
Jacky 2024-05-07 19:45:24 +08:00
parent b429c15893
commit a689608bdb
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
7 changed files with 191 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
settings/cluster.go
View file

@ -3,3 +3,7 @@ package settings
type Cluster struct {
Node []string `ini:",,allowshadow"`
}
var ClusterSettings = Cluster{
Node: []string{},
}

15
settings/cluster_test.go Normal file
View file

@ -0,0 +1,15 @@
package settings
import (
"github.com/stretchr/testify/assert"
"testing"
)
func TestCluster(t *testing.T) {
Init("../app.example.ini")
assert.Equal(t, []string{
"http://10.0.0.1:9000?name=node1&node_secret=my-node-secret&enabled=true",
"http://10.0.0.2:9000?name=node2&node_secret=my-node-secret&enabled=true",
}, ClusterSettings.Node)
}

50
settings/settings.go
View file

@ -6,8 +6,8 @@ import (
"gopkg.in/ini.v1"
"log"
"os"
"reflect"
"strings"
"reflect"
"strings"
"time"
)
@ -26,6 +26,7 @@ var sections = map[string]interface{}{
"openai": &OpenAISettings,
"casdoor": &CasdoorSettings,
"logrotate": &LogrotateSettings,
"cluster": &ClusterSettings,
}
func init() {
@ -40,10 +41,15 @@ func Init(confPath string) {
func Setup() {
var err error
Conf, err = ini.LooseLoad(ConfPath)
Conf, err = ini.LoadSources(ini.LoadOptions{
Loose: true,
AllowShadows: true,
}, ConfPath)
if err != nil {
log.Fatalf("settings.Setup: %v\n", err)
}
MapTo()
parseEnv(&ServerSettings, "SERVER_")
@ -70,8 +76,6 @@ func MapTo() {
}
}
func Save() (err error) {
for k, v := range sections {
reflectFrom(k, v)
@ -85,30 +89,30 @@ func Save() (err error) {
}
func ProtectedFill(targetSettings interface{}, newSettings interface{}) {
s := reflect.TypeOf(targetSettings).Elem()
vt := reflect.ValueOf(targetSettings).Elem()
vn := reflect.ValueOf(newSettings).Elem()
s := reflect.TypeOf(targetSettings).Elem()
vt := reflect.ValueOf(targetSettings).Elem()
vn := reflect.ValueOf(newSettings).Elem()
// copy the values from new to target settings if it is not protected
for i := 0; i < s.NumField(); i++ {
if s.Field(i).Tag.Get("protected") != "true" {
vt.Field(i).Set(vn.Field(i))
}
}
// copy the values from new to target settings if it is not protected
for i := 0; i < s.NumField(); i++ {
if s.Field(i).Tag.Get("protected") != "true" {
vt.Field(i).Set(vn.Field(i))
}
}
}
func mapTo(section string, v interface{}) {
err := Conf.Section(section).MapTo(v)
if err != nil {
log.Fatalf("Cfg.MapTo %s err: %v", section, err)
}
err := Conf.Section(section).MapTo(v)
if err != nil {
log.Fatalf("Cfg.MapTo %s err: %v", section, err)
}
}
func reflectFrom(section string, v interface{}) {
err := Conf.Section(section).ReflectFrom(v)
if err != nil {
log.Fatalf("Cfg.ReflectFrom %s err: %v", section, err)
}
err := Conf.Section(section).ReflectFrom(v)
if err != nil {
log.Fatalf("Cfg.ReflectFrom %s err: %v", section, err)
}
}
func parseEnv(ptr interface{}, prefix string) {
@ -121,5 +125,3 @@ func parseEnv(ptr interface{}, prefix string) {
log.Fatalf("settings.parseEnv: %v\n", err)
}
}