mirror of
https://github.com/XTLS/Xray-core.git
synced 2026-05-08 14:13:22 +00:00
Preserve startup error when browser dialer cleanup fails
Agent-Logs-Url: https://github.com/XTLS/Xray-core/sessions/b8c640ab-f93c-4609-8e34-a8e14e2be9e7 Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
41bc47b1ec
commit
e088cc4a25
@@ -397,7 +397,7 @@ func (s *Instance) Start() error {
|
|||||||
if err := f.Start(); err != nil {
|
if err := f.Start(); err != nil {
|
||||||
s.running = false
|
s.running = false
|
||||||
if stopErr := browser_dialer.StopCollectedDialerProxyURLs(); stopErr != nil {
|
if stopErr := browser_dialer.StopCollectedDialerProxyURLs(); stopErr != nil {
|
||||||
return errors.New("failed to clean up browser dialer after startup failure").Base(errors.New(serial.Concat(err, "; ", stopErr)))
|
return errors.New("browser dialer cleanup after startup failure also failed: ", stopErr).Base(err)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user