gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-13 07:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1598 from openziti/fix-api-session-caching

Browse Source 
Put api session into tunnel state after looking up from cache. Fixes #1597
This commit is contained in:
Paul Lorenz
2023-08-30 17:23:00 -04:00
committed by GitHub
parent b762be7e27 8a4ff813b1
commit e435adc19d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/handler_edge_ctrl/common_tunnel.go
+1
View File
@@ -139,6 +139,7 @@ func (self *baseTunnelRequestContext) ensureApiSessionLocking(configTypes []stri
if _, _, err := self.handler.getAppEnv().GetManagers().ApiSession.MarkLastActivityByTokens(self.apiSession.Token); err != nil {
logger.WithError(err).Error("unexpected error while marking api session activity")
}
state.setCurrentApiSessionId(apiSession.Id)
return true
}
}
router/xgress_edge_tunnel/fabric.go
+3 -2
View File
@@ -239,8 +239,9 @@ func (self *fabricProvider) TunnelService(service tunnel.Service, terminatorInst
}
if response.ApiSession != nil {
log.WithField("apiSessionId", response.ApiSession.SessionId).Info("received new apiSession")
self.updateApiSession(ctrlCh.Id(), response.ApiSession)
if self.updateApiSession(ctrlCh.Id(), response.ApiSession) {
log.WithField("apiSessionId", response.ApiSession.SessionId).Info("received new apiSession")
}
}
if response.Session != nil && response.Session.SessionId != sessionId {