Write config.json after a hot apply (#6686)

* Write config.json after a hot apply

tryHotApply only updated the in-memory snapshot, so bin/config.json stayed
stale until the next cold start and the Telegram/Discord config backups
uploaded old rules. Persist the new config once the API calls succeed; a
write failure is logged and does not restart the running core.

* Test that a hot apply refreshes config.json
This commit is contained in:
kaveh
2026-10-03 02:53:25 +03:30
committed by GitHub
parent 7802167443
commit 3948b83405
4 changed files with 78 additions and 0 deletions
+10
View File
@@ -1454,6 +1454,7 @@ func (s *XrayService) tryHotApply(process *xray.Process, newCfg *xray.Config) bo
}
if diff.Empty() {
process.SetConfig(newCfg)
persistHotConfig(process)
return true
}
// The core's RemoveUser drops the credential only, so a disabled or deleted
@@ -1522,9 +1523,18 @@ func (s *XrayService) tryHotApply(process *xray.Process, newCfg *xray.Config) bo
}
process.SetConfig(newCfg)
persistHotConfig(process)
return true
}
// persistHotConfig refreshes config.json after a hot apply; a write failure is
// logged only, since the running core already has the change.
func persistHotConfig(process *xray.Process) {
if err := process.PersistConfig(); err != nil {
logger.Warning("hot apply: failed to update config.json:", err)
}
}
// addUserReconciling adds a user, and on an email conflict (the user was
// already applied through the runtime API) replaces the existing user instead.
func addUserReconciling(api *xray.XrayAPI, u xray.UserOp) error {