staging commit to unblock nick - compile failure

openziti-test-kitchen · Jan 3, 2022 · 66c553d · 66c553d
1 parent 1e6c770
commit 66c553d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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.