gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-13 16:21:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

check the return from UnregisterService and only remove the service if it returns true

Browse Source
This commit is contained in:
ziti-ci
2020-12-18 14:36:38 -05:00
parent c351f3e452
commit 84bf1b53d5
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/cziti/sdk.go
+10 -3
View File
@@ -226,8 +226,12 @@ func serviceCB(_ C.ziti_context, service *C.ziti_service, status C.int, tnlr_ctx
if ok && found != nil {
log.Infof("service with id: %s, name: %s exists. updating service.", svcId, name)
fs := found.(ZService)
DNSMgr.UnregisterService(fs.InterceptHost, fs.InterceptPort)
zid.Services.Delete(svcId)
ok := DNSMgr.UnregisterService(fs.InterceptHost, fs.InterceptPort)
if ok {
zid.Services.Delete(svcId)
} else {
log.Warn("unregister service from serviceCB was not ok?")
}
} else {
log.Debugf("new service with id: %s, name: %s in context %d", svcId, name, &zid)
}
@@ -290,7 +294,10 @@ func serviceUnavailable(ctx *ZIdentity, svcId string, name string) {
found, ok := ctx.Services.Load(svcId)
if ok {
fs := found.(ZService)
DNSMgr.UnregisterService(fs.InterceptHost, fs.InterceptPort)
ok := DNSMgr.UnregisterService(fs.InterceptHost, fs.InterceptPort)
if !ok {
log.Warn("unregister service from serviceUnavailable was not ok?")
}
ctx.Services.Delete(svcId)
ServiceChanges <- ServiceChange{
Operation: REMOVED,