extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-13 17:57:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

better deactivation (#10)

Browse Source
This commit is contained in:
Michael Quigley
2022-07-29 16:27:03 -04:00
parent 4080e219a3
commit d82b75f3b2
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
controller/untunnel.go
View File

@ -59,19 +59,24 @@ func untunnelHandler(params tunnel.UntunnelParams, principal *rest_model_zrok.Pr
logrus.Errorf("error finding services for account: %v", err)
return tunnel.NewUntunnelInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
changed := false
for _, svc := range svcs {
if svc.ZitiId == svcId {
if err := str.DeactivateService(svc.Id, tx); err != nil {
svc.Active = false
if err := str.UpdateService(svc, tx); err != nil {
logrus.Errorf("error deactivating service '%v': %v", svcId, err)
return tunnel.NewUntunnelInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
if err := tx.Commit(); err != nil {
logrus.Errorf("error committing: %v", err)
return tunnel.NewUntunnelInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
changed = true
logrus.Infof("deactivated service '%v'", svcId)
}
}
if changed {
if err := tx.Commit(); err != nil {
logrus.Errorf("error committing: %v", err)
return tunnel.NewUntunnelInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
}
return tunnel.NewUntunnelOK()
}