jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2026-09-29 21:07:54 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

fix(hub): synchronise system status access (#2452)

Browse Source
This commit is contained in:
user01010111
2026-09-29 11:58:46 +13:00
committed by GitHub
parent 083b28a1fc
commit 09a277f074
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/hub/systems/system.go
View File

@@ -41,7 +41,8 @@ type System struct {
Id string `db:"id"`
Host string `db:"host"`
Port string `db:"port"`
Status string `db:"status"`
Status string `db:"status"` // Use GetStatus/swapStatus after publishing the system.
statusMu sync.RWMutex // Protects Status and exchanges used by alert transitions.
manager *SystemManager // Manager that this system belongs to
client atomic.Pointer[ssh.Client] // SSH client for fetching data
sshTransport *transport.SSHTransport // SSH transport for requests
@@ -65,6 +66,22 @@ type System struct {
lastSavedMonitorProbe map[string]int64
}
// GetStatus returns the current monitoring status.
func (sys *System) GetStatus() string {
sys.statusMu.RLock()
defer sys.statusMu.RUnlock()
return sys.Status
}
// swapStatus updates the status and returns the previous value as one operation.
func (sys *System) swapStatus(status string) string {
sys.statusMu.Lock()
defer sys.statusMu.Unlock()
previous := sys.Status
sys.Status = status
return previous
}
func (sm *SystemManager) NewSystem(systemId string) *System {
system := &System{
Id: systemId,
@@ -101,7 +118,7 @@ func (sys *System) StartUpdater() {
// update immediately if system is not paused (only for ws connections)
// we'll wait a minute before connecting via SSH to prioritize ws connections
if sys.Status != paused && sys.ctx.Err() == nil {
if sys.GetStatus() != paused && sys.ctx.Err() == nil {
if err := sys.update(); err != nil {
_ = sys.setDown(err)
}
@@ -134,7 +151,7 @@ func (sys *System) StartUpdater() {
// update updates the system data and records.
func (sys *System) update() error {
if sys.Status == paused {
if sys.GetStatus() == paused {
sys.handlePaused()
return nil
}
@@ -603,7 +620,7 @@ func (sys *System) HasUser(app core.App, user *core.Record) bool {
// encountered during the process of updating the system status.
// It is a no-op if the system's context has been cancelled.
func (sys *System) setDown(originalError error) error {
if sys.Status == down || sys.Status == paused {
if status := sys.GetStatus(); status == down || status == paused {
return nil
}
// the updater can race shutdown, and the app may already be disposed by the
@@ -885,7 +902,7 @@ func (sys *System) fetchDataViaSSH(options common.DataRequestOptions) (*system.C
// The operation can request a retry by returning true as the first return value.
func (sys *System) runSSHOperation(timeout time.Duration, retries int, operation func(*ssh.Session) (bool, error)) error {
for attempt := 0; attempt <= retries; attempt++ {
if sys.client.Load() == nil || sys.Status == down {
if sys.client.Load() == nil || sys.GetStatus() == down {
if err := sys.createSSHClient(); err != nil {
return err
}