From 66c553d361120a302698983e7f2f45193b321182 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 3 Jan 2022 15:57:37 -0500 Subject: [PATCH] staging commit to unblock nick - compile failure --- web/web.go | 2 +- web/zitifiedweb.go | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/web.go b/web/web.go index 5aba8896dbd..c530e3e033e 100644 --- a/web/web.go +++ b/web/web.go @@ -566,7 +566,7 @@ func (h *Handler) Reload() <-chan chan error { } // Listener creates the TCP listener for web requests. -func (h *Handler) Listener() (net.Listener, error) { +func (h *Handler) useZitiListener() (net.Listener, error) { level.Info(h.logger).Log("msg", "Start listening for connections", "address", h.options.ListenAddress) listener, err := net.Listen("tcp", h.options.ListenAddress) diff --git a/web/zitifiedweb.go b/web/zitifiedweb.go index 0de5d9f5fb1..cc22eafe745 100644 --- a/web/zitifiedweb.go +++ b/web/zitifiedweb.go @@ -20,6 +20,7 @@ import ( "github.com/openziti/sdk-golang/ziti" "golang.org/x/net/netutil" "net" + "runtime" "strings" zitiCfg "github.com/openziti/sdk-golang/ziti/config" @@ -30,7 +31,12 @@ var ZitiIdFile string func init() { ZitiIdServiceName = "boundprometheus" - ZitiIdFile = "/mnt/v/temp/prometheus/prometheusZitiIdentity.json" + + if runtime.GOOS == "windows" { + ZitiIdFile = "v:/temp/prometheus/prometheusZitiIdentity.json" + } else { + ZitiIdFile = "/mnt/v/temp/prometheus/prometheusZitiIdentity.json" + } } // Listener creates the TCP listener for web requests.