TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-04 16:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
GoEdgeLab
2022-08-22 11:02:16 +08:00
parent 02e25967b1
commit 04ec038b65
6 changed files with 53 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/db/models/ip_library_file_dao.go
View File

@@ -337,7 +337,7 @@ func (this *IPLibraryFileDAO) GenerateIPLibrary(tx *dbs.Tx, libraryFileId int64)
var countries = []*iplibrary.Country{} var countries = []*iplibrary.Country{}
for _, country := range dbCountries { for _, country := range dbCountries {
countries = append(countries, &iplibrary.Country{ countries = append(countries, &iplibrary.Country{
Id: int64(country.Id), Id: country.Id,
Name: country.DisplayName(), Name: country.DisplayName(),
Codes: country.AllCodes(), Codes: country.AllCodes(),
}) })
@@ -352,7 +352,7 @@ func (this *IPLibraryFileDAO) GenerateIPLibrary(tx *dbs.Tx, libraryFileId int64)
var provinces = []*iplibrary.Province{} var provinces = []*iplibrary.Province{}
for _, province := range dbProvinces { for _, province := range dbProvinces {
provinces = append(provinces, &iplibrary.Province{ provinces = append(provinces, &iplibrary.Province{
Id: int64(province.Id), Id: province.Id,
Name: province.DisplayName(), Name: province.DisplayName(),
Codes: province.AllCodes(), Codes: province.AllCodes(),
}) })
@@ -367,7 +367,7 @@ func (this *IPLibraryFileDAO) GenerateIPLibrary(tx *dbs.Tx, libraryFileId int64)
var cities = []*iplibrary.City{} var cities = []*iplibrary.City{}
for _, city := range dbCities { for _, city := range dbCities {
cities = append(cities, &iplibrary.City{ cities = append(cities, &iplibrary.City{
Id: int64(city.Id), Id: city.Id,
Name: city.DisplayName(), Name: city.DisplayName(),
Codes: city.AllCodes(), Codes: city.AllCodes(),
}) })
@@ -382,7 +382,7 @@ func (this *IPLibraryFileDAO) GenerateIPLibrary(tx *dbs.Tx, libraryFileId int64)
var towns = []*iplibrary.Town{} var towns = []*iplibrary.Town{}
for _, town := range dbTowns { for _, town := range dbTowns {
towns = append(towns, &iplibrary.Town{ towns = append(towns, &iplibrary.Town{
Id: int64(town.Id), Id: town.Id,
Name: town.DisplayName(), Name: town.DisplayName(),
Codes: town.AllCodes(), Codes: town.AllCodes(),
}) })
@@ -397,7 +397,7 @@ func (this *IPLibraryFileDAO) GenerateIPLibrary(tx *dbs.Tx, libraryFileId int64)
var providers = []*iplibrary.Provider{} var providers = []*iplibrary.Provider{}
for _, provider := range dbProviders { for _, provider := range dbProviders {
providers = append(providers, &iplibrary.Provider{ providers = append(providers, &iplibrary.Provider{
Id: int64(provider.Id), Id: provider.Id,
Name: provider.DisplayName(), Name: provider.DisplayName(),
Codes: provider.AllCodes(), Codes: provider.AllCodes(),
}) })

2
internal/db/models/ip_library_file_dao_test.go
View File

@@ -12,7 +12,7 @@ func TestIPLibraryFileDAO_GenerateIPLibrary(t *testing.T) {
dbs.NotifyReady() dbs.NotifyReady()
var tx *dbs.Tx var tx *dbs.Tx
err := models.SharedIPLibraryFileDAO.GenerateIPLibrary(tx, 3) err := models.SharedIPLibraryFileDAO.GenerateIPLibrary(tx, 4)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

13
internal/db/models/ns_node_dao.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/iwind/TeaGo/dbs" "github.com/iwind/TeaGo/dbs"
"github.com/iwind/TeaGo/rands" "github.com/iwind/TeaGo/rands"
"github.com/iwind/TeaGo/types" "github.com/iwind/TeaGo/types"
"time"
) )
const ( const (
@@ -347,7 +348,7 @@ func (this *NSNodeDAO) UpdateNodeIsInstalled(tx *dbs.Tx, nodeId int64, isInstall
} }
// UpdateNodeStatus 更改节点状态 // UpdateNodeStatus 更改节点状态
func (this NSNodeDAO) UpdateNodeStatus(tx *dbs.Tx, nodeId int64, nodeStatus *nodeconfigs.NodeStatus) error { func (this *NSNodeDAO) UpdateNodeStatus(tx *dbs.Tx, nodeId int64, nodeStatus *nodeconfigs.NodeStatus) error {
if nodeStatus == nil { if nodeStatus == nil {
return nil return nil
} }
@@ -516,6 +517,7 @@ func (this *NSNodeDAO) UpdateNodeActive(tx *dbs.Tx, nodeId int64, isActive bool)
Pk(nodeId). Pk(nodeId).
Set("isActive", isActive). Set("isActive", isActive).
Set("statusIsNotified", false). Set("statusIsNotified", false).
Set("inactiveNotifiedAt", 0).
Update() Update()
return err return err
} }
@@ -562,9 +564,18 @@ func (this *NSNodeDAO) UpdateNodeStatusIsNotified(tx *dbs.Tx, nodeId int64) erro
return this.Query(tx). return this.Query(tx).
Pk(nodeId). Pk(nodeId).
Set("statusIsNotified", true). Set("statusIsNotified", true).
Set("inactiveNotifiedAt", time.Now().Unix()).
UpdateQuickly() UpdateQuickly()
} }
// FindNodeInactiveNotifiedAt 读取上次的节点离线通知时间
func (this *NSNodeDAO) FindNodeInactiveNotifiedAt(tx *dbs.Tx, nodeId int64) (int64, error) {
return this.Query(tx).
Pk(nodeId).
Result("inactiveNotifiedAt").
FindInt64Col(0)
}
// FindAllNodeIdsMatch 匹配节点并返回节点ID // FindAllNodeIdsMatch 匹配节点并返回节点ID
func (this *NSNodeDAO) FindAllNodeIdsMatch(tx *dbs.Tx, clusterId int64, includeSecondaryNodes bool, isOn configutils.BoolState) (result []int64, err error) { func (this *NSNodeDAO) FindAllNodeIdsMatch(tx *dbs.Tx, clusterId int64, includeSecondaryNodes bool, isOn configutils.BoolState) (result []int64, err error) {
query := this.Query(tx) query := this.Query(tx)

66
internal/db/models/ns_node_model.go
View File

@@ -4,41 +4,43 @@ import "github.com/iwind/TeaGo/dbs"
// NSNode 域名服务器节点 // NSNode 域名服务器节点
type NSNode struct { type NSNode struct {
Id uint32 `field:"id"` // ID Id uint32 `field:"id"` // ID
AdminId uint32 `field:"adminId"` // 管理员ID AdminId uint32 `field:"adminId"` // 管理员ID
ClusterId uint32 `field:"clusterId"` // 集群ID ClusterId uint32 `field:"clusterId"` // 集群ID
Name string `field:"name"` // 节点名称 Name string `field:"name"` // 节点名称
IsOn bool `field:"isOn"` // 是否启用 IsOn bool `field:"isOn"` // 是否启用
Status dbs.JSON `field:"status"` // 运行状态 Status dbs.JSON `field:"status"` // 运行状态
UniqueId string `field:"uniqueId"` // 节点ID UniqueId string `field:"uniqueId"` // 节点ID
Secret string `field:"secret"` // 密钥 Secret string `field:"secret"` // 密钥
IsUp bool `field:"isUp"` // 是否运行 IsUp bool `field:"isUp"` // 是否运行
IsInstalled bool `field:"isInstalled"` // 是否已安装 IsInstalled bool `field:"isInstalled"` // 是否已安装
InstallStatus dbs.JSON `field:"installStatus"` // 安装状态 InstallStatus dbs.JSON `field:"installStatus"` // 安装状态
InstallDir string `field:"installDir"` // 安装目录 InstallDir string `field:"installDir"` // 安装目录
State uint8 `field:"state"` // 状态 State uint8 `field:"state"` // 状态
IsActive bool `field:"isActive"` // 是否活跃 IsActive bool `field:"isActive"` // 是否活跃
StatusIsNotified uint8 `field:"statusIsNotified"` // 活跃状态已经通知 StatusIsNotified uint8 `field:"statusIsNotified"` // 活跃状态已经通知
ConnectedAPINodes dbs.JSON `field:"connectedAPINodes"` // 当前连接的API节点 InactiveNotifiedAt uint64 `field:"inactiveNotifiedAt"` // 离线通知时间
ConnectedAPINodes dbs.JSON `field:"connectedAPINodes"` // 当前连接的API节点
} }
type NSNodeOperator struct { type NSNodeOperator struct {
Id interface{} // ID Id any // ID
AdminId interface{} // 管理员ID AdminId any // 管理员ID
ClusterId interface{} // 集群ID ClusterId any // 集群ID
Name interface{} // 节点名称 Name any // 节点名称
IsOn interface{} // 是否启用 IsOn any // 是否启用
Status interface{} // 运行状态 Status any // 运行状态
UniqueId interface{} // 节点ID UniqueId any // 节点ID
Secret interface{} // 密钥 Secret any // 密钥
IsUp interface{} // 是否运行 IsUp any // 是否运行
IsInstalled interface{} // 是否已安装 IsInstalled any // 是否已安装
InstallStatus interface{} // 安装状态 InstallStatus any // 安装状态
InstallDir interface{} // 安装目录 InstallDir any // 安装目录
State interface{} // 状态 State any // 状态
IsActive interface{} // 是否活跃 IsActive any // 是否活跃
StatusIsNotified interface{} // 活跃状态已经通知 StatusIsNotified any // 活跃状态已经通知
ConnectedAPINodes interface{} // 当前连接的API节点 InactiveNotifiedAt any // 离线通知时间
ConnectedAPINodes any // 当前连接的API节点
} }
func NewNSNodeOperator() *NSNodeOperator { func NewNSNodeOperator() *NSNodeOperator {

2
internal/setup/sql.go
View File

File diff suppressed because one or more lines are too long

92
internal/tasks/ns_node_monitor_task.go
View File

@@ -1,92 +0,0 @@
package tasks
import (
"github.com/TeaOSLab/EdgeAPI/internal/db/models"
"github.com/TeaOSLab/EdgeAPI/internal/goman"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/iwind/TeaGo/dbs"
"time"
)
func init() {
dbs.OnReadyDone(func() {
goman.New(func() {
NewNSNodeMonitorTask(1 * time.Minute).Start()
})
})
}
// NSNodeMonitorTask 边缘节点监控任务
type NSNodeMonitorTask struct {
BaseTask
ticker *time.Ticker
}
func NewNSNodeMonitorTask(duration time.Duration) *NSNodeMonitorTask {
return &NSNodeMonitorTask{
ticker: time.NewTicker(duration),
}
}
func (this *NSNodeMonitorTask) Start() {
for range this.ticker.C {
err := this.Loop()
if err != nil {
this.logErr("NS_NODE_MONITOR", err.Error())
}
}
}
func (this *NSNodeMonitorTask) Loop() error {
// 检查是否为主节点
if !models.SharedAPINodeDAO.CheckAPINodeIsPrimaryWithoutErr() {
return nil
}
clusters, err := models.SharedNSClusterDAO.FindAllEnabledClusters(nil)
if err != nil {
return err
}
for _, cluster := range clusters {
err := this.monitorCluster(cluster)
if err != nil {
return err
}
}
return nil
}
func (this *NSNodeMonitorTask) monitorCluster(cluster *models.NSCluster) error {
clusterId := int64(cluster.Id)
// 检查离线节点
inactiveNodes, err := models.SharedNSNodeDAO.FindAllNotifyingInactiveNodesWithClusterId(nil, clusterId)
if err != nil {
return err
}
for _, node := range inactiveNodes {
subject := "DNS节点\"" + node.Name + "\"已处于离线状态"
msg := "DNS节点\"" + node.Name + "\"已处于离线状态"
err = models.SharedMessageDAO.CreateNodeMessage(nil, nodeconfigs.NodeRoleDNS, clusterId, int64(node.Id), models.MessageTypeNSNodeInactive, models.LevelError, subject, msg, nil, false)
if err != nil {
return err
}
// 修改在线状态
err = models.SharedNSNodeDAO.UpdateNodeStatusIsNotified(nil, int64(node.Id))
if err != nil {
return err
}
}
// TODO 检查恢复连接
// 检查CPU、内存、磁盘不足节点，而且离线的节点不再重复提示
// TODO 需要实现
// TODO 检查53/tcp、53/udp是否能够访问
return nil
}