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

do not call 'ziti.NewContext' multiple times (#1023)

Browse Source
This commit is contained in:
Michael Quigley
2025-08-06 10:46:24 -04:00
parent 14c849f62d
commit 788418cff7
9 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controller/controller.go
View File

@ -9,6 +9,7 @@ import (
"github.com/go-openapi/loads"
influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/jessevdk/go-flags"
"github.com/openziti/zrok/controller/agentController"
"github.com/openziti/zrok/controller/config"
"github.com/openziti/zrok/controller/limits"
"github.com/openziti/zrok/controller/metrics"
@ -26,6 +27,7 @@ var (
str *store.Store
idb influxdb2.Client
limitsAgent *limits.Agent
agentCtrl *agentController.Controller
)
func Run(inCfg *config.Config) error {
@ -71,6 +73,12 @@ func Run(inCfg *config.Config) error {
api.AdminRemoveOrganizationMemberHandler = newRemoveOrganizationMemberHandler()
api.AdminUpdateFrontendHandler = newUpdateFrontendHandler()
if cfg.AgentController != nil {
if i, err := agentController.NewAgentController(cfg.AgentController); err == nil {
agentCtrl = i
logrus.Infof("created new agent controller")
} else {
return errors.Wrap(err, "error creating agent controller")
}
api.AgentEnrollHandler = newAgentEnrollHandler()
api.AgentPingHandler = newAgentPingHandler()
api.AgentRemoteAccessHandler = newAgentRemoteAccessHandler()