xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-30 15:07:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(xray): do not revive a manually stopped Xray on a background restart

Browse Source 
RestartXray cleared isManuallyStopped unconditionally at its top, so the @30s
pending-config cron (and warp/ldap/outbound reconcile jobs) that call
RestartXray(false) resurrected an Xray the admin had deliberately stopped —
unlike the crash-detector, which honors the manual-stop flag. Skip a non-forced
restart while the stop flag is set; only an explicit forced restart clears it.
This commit is contained in:
MHSanaei
2026-07-15 03:24:43 +02:00
parent 89c27c5835
commit 116ef900d5
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/xray.go
+6
View File
@@ -986,6 +986,12 @@ func (s *XrayService) RestartXray(isForce bool) error {
lock.Lock()
defer lock.Unlock()
logger.Debug("restart Xray, force:", isForce)
// A background reconcile (a pending config-change flag, warp/ldap/outbound
// jobs) must not revive an Xray the admin deliberately stopped; only an
// explicit forced restart clears the manual-stop state.
if !isForce && isManuallyStopped.Load() {
return nil
}
isManuallyStopped.Store(false)
xrayConfig, err := s.GetXrayConfig()