GuanM/XrayR
1
0
Fork 0
mirror of https://github.com/XrayR-project/XrayR.git synced 2025-06-08 05:19:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: on some circumstance, periodic will run twice

Browse Source
This commit is contained in:
Senis 2022-11-07 15:55:30 +08:00
parent a397af5d73
commit 3b96b352cb
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
service/controller/controller.go
View File

@ -44,6 +44,7 @@ type Controller struct {
ohm outbound.Manager ohm outbound.Manager
stm stats.Manager stm stats.Manager
dispatcher *mydispatcher.DefaultDispatcher dispatcher *mydispatcher.DefaultDispatcher
startAt time.Time
} }
// New return a Controller service with default parameters. // New return a Controller service with default parameters.
@ -57,6 +58,7 @@ func New(server *core.Instance, api api.API, config *Config, panelType string) *
ohm: server.GetFeature(outbound.ManagerType()).(outbound.Manager), ohm: server.GetFeature(outbound.ManagerType()).(outbound.Manager),
stm: server.GetFeature(stats.ManagerType()).(stats.Manager), stm: server.GetFeature(stats.ManagerType()).(stats.Manager),
dispatcher: server.GetFeature(routing.DispatcherType()).(*mydispatcher.DefaultDispatcher), dispatcher: server.GetFeature(routing.DispatcherType()).(*mydispatcher.DefaultDispatcher),
startAt: time.Now(),
} }
return controller return controller
} }
@ -123,19 +125,15 @@ func (c *Controller) Start() error {
c.limitedUsers = make(map[api.UserInfo]LimitInfo) c.limitedUsers = make(map[api.UserInfo]LimitInfo)
c.warnedUsers = make(map[api.UserInfo]int) c.warnedUsers = make(map[api.UserInfo]int)
} }
log.Printf("[%s: %d] Start monitor node status", c.nodeInfo.NodeType, c.nodeInfo.NodeID)
// delay to start nodeInfoMonitor
go func() {
time.Sleep(time.Duration(c.config.UpdatePeriodic) * time.Second)
_ = c.nodeInfoMonitorPeriodic.Start()
}()
// start nodeInfoMonitor
log.Printf("[%s: %d] Start monitor node status", c.nodeInfo.NodeType, c.nodeInfo.NodeID)
go c.nodeInfoMonitorPeriodic.Start()
// start userReport
log.Printf("[%s: %d] Start report node status", c.nodeInfo.NodeType, c.nodeInfo.NodeID) log.Printf("[%s: %d] Start report node status", c.nodeInfo.NodeType, c.nodeInfo.NodeID)
// delay to start userReport go c.userReportPeriodic.Start()
go func() {
time.Sleep(time.Duration(c.config.UpdatePeriodic) * time.Second)
_ = c.userReportPeriodic.Start()
}()
return nil return nil
} }
@ -158,6 +156,11 @@ func (c *Controller) Close() error {
} }
func (c *Controller) nodeInfoMonitor() (err error) { func (c *Controller) nodeInfoMonitor() (err error) {
// delay to start
if time.Since(c.startAt) < time.Duration(c.config.UpdatePeriodic)*time.Second {
return nil
}
// First fetch Node Info // First fetch Node Info
newNodeInfo, err := c.apiClient.GetNodeInfo() newNodeInfo, err := c.apiClient.GetNodeInfo()
if err != nil { if err != nil {
@ -442,6 +445,11 @@ func limitUser(c *Controller, user api.UserInfo, silentUsers *[]api.UserInfo) {
} }
func (c *Controller) userInfoMonitor() (err error) { func (c *Controller) userInfoMonitor() (err error) {
// delay to start
if time.Since(c.startAt) < time.Duration(c.config.UpdatePeriodic)*time.Second {
return nil
}
// Get server status // Get server status
CPU, Mem, Disk, Uptime, err := serverstatus.GetSystemInfo() CPU, Mem, Disk, Uptime, err := serverstatus.GetSystemInfo()
if err != nil { if err != nil {