From 7fd126a0cda3b46dcfeb6dc9b3e6116aec524555 Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Sun, 23 Apr 2023 13:08:33 -0400 Subject: cmd/xedn: don't expose metrics publicly Signed-off-by: Xe Iaso --- cmd/xedn/fly.toml | 4 ++-- cmd/xedn/main.go | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'cmd') diff --git a/cmd/xedn/fly.toml b/cmd/xedn/fly.toml index a84af65..b293527 100644 --- a/cmd/xedn/fly.toml +++ b/cmd/xedn/fly.toml @@ -48,5 +48,5 @@ processes = [] timeout = "2s" [metrics] -port = 8080 -path = "/.within/metrics" \ No newline at end of file +port = 8081 +path = "/metrics" diff --git a/cmd/xedn/main.go b/cmd/xedn/main.go index 50127f5..e059703 100644 --- a/cmd/xedn/main.go +++ b/cmd/xedn/main.go @@ -37,10 +37,11 @@ import ( ) var ( - b2Backend = flag.String("b2-backend", "f001.backblazeb2.com", "Backblaze B2 base host") - addr = flag.String("addr", ":8080", "server address") - dir = flag.String("dir", os.Getenv("XEDN_STATE"), "where XeDN should store cached data") - staticDir = flag.String("static-dir", envOr("XEDN_STATIC", "./static"), "where XeDN should look for static assets") + b2Backend = flag.String("b2-backend", "f001.backblazeb2.com", "Backblaze B2 base host") + addr = flag.String("addr", ":8080", "server bind address") + metricsAddr = flag.String("metrics-addr", ":8081", "metrics bind address") + dir = flag.String("dir", os.Getenv("XEDN_STATE"), "where XeDN should store cached data") + staticDir = flag.String("static-dir", envOr("XEDN_STATIC", "./static"), "where XeDN should look for static assets") //go:embed index.html indexHTML []byte @@ -425,9 +426,9 @@ func main() { os.MkdirAll(*dir, 0700) + go http.ListenAndServe(*metricsAddr, http.HandlerFunc(tsweb.VarzHandler)) + mux := http.NewServeMux() - mux.HandleFunc("/.within/metrics", tsweb.VarzHandler) - mux.Handle("/.within/metrics/json", expvar.Handler()) mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { if r.URL.Path != "/" { -- cgit v1.2.3