forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-16 00:43:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor Clean-up

Browse source
This commit is contained in:
Shivam Sharma 2021-11-12 14:24:21 +05:30
parent c23cd5e332
commit a5bcab1c65
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
command/server/server.go
View file

@ -18,7 +18,6 @@ import (
"github.com/ethereum/go-ethereum/graphql" "github.com/ethereum/go-ethereum/graphql"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/metrics/exp"
"github.com/ethereum/go-ethereum/metrics/influxdb" "github.com/ethereum/go-ethereum/metrics/influxdb"
"github.com/ethereum/go-ethereum/metrics/prometheus" "github.com/ethereum/go-ethereum/metrics/prometheus"
"github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/node"
@ -158,7 +157,7 @@ func (s *Server) setupMetrics(config *TelemetryConfig) error {
// Hook go-metrics into expvar on any /debug/metrics request, load all vars // Hook go-metrics into expvar on any /debug/metrics request, load all vars
// from the registry into expvar, and execute regular expvar handler. // from the registry into expvar, and execute regular expvar handler.
if len(config.PrometheusAddr) != 0 { if config.PrometheusAddr != "" {
prometheusMux := http.NewServeMux() prometheusMux := http.NewServeMux()
@ -167,20 +166,13 @@ func (s *Server) setupMetrics(config *TelemetryConfig) error {
// http.HandleFunc("/debug/vars", e.expHandler) // http.HandleFunc("/debug/vars", e.expHandler)
// haven't found an elegant way, so just use a different endpoint // haven't found an elegant way, so just use a different endpoint
prometheusMux.HandleFunc("/debug/metrics", func(w http.ResponseWriter, r *http.Request) { prometheusMux.HandleFunc("/metrics", func(w http.ResponseWriter, r *http.Request) {
exp.ExpHandler(metrics.DefaultRegistry)
})
prometheusMux.HandleFunc("/debug/metrics/prometheus", func(w http.ResponseWriter, r *http.Request) {
prometheus.Handler(metrics.DefaultRegistry) prometheus.Handler(metrics.DefaultRegistry)
}) })
promServer := &http.Server{ promServer := &http.Server{
Addr: config.PrometheusAddr, Addr: config.PrometheusAddr,
Handler: prometheusMux, Handler: prometheusMux,
ReadTimeout: 10 * time.Second,
WriteTimeout: 10 * time.Second,
MaxHeaderBytes: 1 << 20,
} }
go func() { go func() {