mirror of
https://github.com/0xJacky/nginx-ui.git
synced 2025-05-11 02:15:48 +02:00
feat: use settings file to predefine nodes #169
This commit is contained in:
parent
b429c15893
commit
a689608bdb
7 changed files with 191 additions and 48 deletions
|
@ -1,3 +1,4 @@
|
|||
; suppress inspection "DuplicateKeyInSection" for whole file
|
||||
[server]
|
||||
HttpPort = 9000
|
||||
RunMode = debug
|
||||
|
@ -47,4 +48,6 @@ CMD = logrotate /etc/logrotate.d/nginx
|
|||
Interval = 1440
|
||||
|
||||
[cluster]
|
||||
Node =
|
||||
Node = http://10.0.0.1:9000?name=node1&node_secret=my-node-secret&enabled=true
|
||||
Node = http://10.0.0.2:9000?name=node2&node_secret=my-node-secret&enabled=true
|
||||
Node = http://10.0.0.3?name=node3&node_secret=my-node-secret&enabled=true
|
||||
|
|
|
@ -44,6 +44,7 @@ func InitAfterDatabase() {
|
|||
registerPredefinedUser,
|
||||
cert.InitRegister,
|
||||
InitCronJobs,
|
||||
registerPredefinedClusterNodes,
|
||||
analytic.RetrieveNodesStatus,
|
||||
}
|
||||
|
||||
|
|
71
internal/kernal/cluster.go
Normal file
71
internal/kernal/cluster.go
Normal file
|
@ -0,0 +1,71 @@
|
|||
package kernal
|
||||
|
||||
import (
|
||||
"github.com/0xJacky/Nginx-UI/internal/logger"
|
||||
"github.com/0xJacky/Nginx-UI/model"
|
||||
"github.com/0xJacky/Nginx-UI/query"
|
||||
"github.com/0xJacky/Nginx-UI/settings"
|
||||
"gorm.io/gen/field"
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func registerPredefinedClusterNodes() {
|
||||
if len(settings.ClusterSettings.Node) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
q := query.Environment
|
||||
for _, nodeUrl := range settings.ClusterSettings.Node {
|
||||
func() {
|
||||
node, err := parseNodeUrl(nodeUrl)
|
||||
if err != nil {
|
||||
logger.Error(nodeUrl, err)
|
||||
return
|
||||
}
|
||||
|
||||
if node.Name == "" {
|
||||
logger.Error(nodeUrl, "Node name is required")
|
||||
return
|
||||
}
|
||||
|
||||
if node.URL == "" {
|
||||
logger.Error(nodeUrl, "Node URL is required")
|
||||
return
|
||||
}
|
||||
|
||||
if node.Token == "" {
|
||||
logger.Error(nodeUrl, "Node Token is required")
|
||||
return
|
||||
}
|
||||
|
||||
_, err = q.Where(q.URL.Eq(node.URL)).
|
||||
Attrs(field.Attrs(node)).
|
||||
FirstOrCreate()
|
||||
if err != nil {
|
||||
logger.Error(node.URL, err)
|
||||
}
|
||||
}()
|
||||
}
|
||||
}
|
||||
|
||||
func parseNodeUrl(nodeUrl string) (env *model.Environment, err error) {
|
||||
u, err := url.Parse(nodeUrl)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
var sb strings.Builder
|
||||
sb.WriteString(u.Scheme)
|
||||
sb.WriteString("://")
|
||||
sb.WriteString(u.Host)
|
||||
sb.WriteString(u.Path)
|
||||
|
||||
env = &model.Environment{
|
||||
Name: u.Query().Get("name"),
|
||||
URL: sb.String(),
|
||||
Token: u.Query().Get("node_secret"),
|
||||
Enabled: u.Query().Get("enabled") == "true",
|
||||
}
|
||||
|
||||
return
|
||||
}
|
47
internal/kernal/cluster_test.go
Normal file
47
internal/kernal/cluster_test.go
Normal file
|
@ -0,0 +1,47 @@
|
|||
package kernal
|
||||
|
||||
import (
|
||||
"github.com/0xJacky/Nginx-UI/settings"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func Test_parseNodeUrl(t *testing.T) {
|
||||
settings.Init("../../app.example.ini")
|
||||
t.Log(settings.ClusterSettings.Node)
|
||||
node := settings.ClusterSettings.Node[0]
|
||||
|
||||
env, err := parseNodeUrl(node)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, "node1", env.Name)
|
||||
assert.Equal(t, "http://10.0.0.1:9000", env.URL)
|
||||
assert.Equal(t, "my-node-secret", env.Token)
|
||||
assert.Equal(t, true, env.Enabled)
|
||||
|
||||
node = settings.ClusterSettings.Node[1]
|
||||
|
||||
env, err = parseNodeUrl(node)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, "node2", env.Name)
|
||||
assert.Equal(t, "http://10.0.0.2:9000", env.URL)
|
||||
assert.Equal(t, "my-node-secret", env.Token)
|
||||
assert.Equal(t, true, env.Enabled)
|
||||
|
||||
node = settings.ClusterSettings.Node[2]
|
||||
|
||||
env, err = parseNodeUrl(node)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, "node3", env.Name)
|
||||
assert.Equal(t, "http://10.0.0.3", env.URL)
|
||||
assert.Equal(t, "my-node-secret", env.Token)
|
||||
assert.Equal(t, true, env.Enabled)
|
||||
}
|
|
@ -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
15
settings/cluster_test.go
Normal 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)
|
||||
}
|
|
@ -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)
|
||||
|
@ -121,5 +125,3 @@ func parseEnv(ptr interface{}, prefix string) {
|
|||
log.Fatalf("settings.parseEnv: %v\n", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue