Skip to content

Commit 7d3062a

Browse files
committed
rpn: older main proxy already stopped by ipn/proxies
1 parent 5d556e2 commit 7d3062a

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

intra/ipn/rpn.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,12 @@ func (r *rpnp) Emplace(new Proxy) (err error) {
275275
newid := idstr(new)
276276

277277
defer func() {
278-
core.Go("rpn.emplace."+oldid, func() {
279-
if err != nil {
278+
if err != nil {
279+
core.Go("rpn.emplace."+oldid, func() {
280280
n := r.PurgeAll() // purge all kids on error
281-
log.I("proxy: rpn: emplace: %s[%s] failed; purged %d kids", oldid, newid, n)
282-
} else if !Same(old, new) {
283-
serr := old.Stop() // stop old proxy if it is different
284-
log.I("proxy: rpn: emplace: %s; %s stopped; err %v", oldid, newid, serr)
285-
}
286-
})
281+
log.E("proxy: rpn: emplace: %s[%s] failed; purged %d kids; emplace err: %v", oldid, newid, n, err)
282+
})
283+
}
287284
}()
288285

289286
if oldid != newid {

0 commit comments

Comments
 (0)