Commit b3921408 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

indexer: fix simple semgrep issues (#2857)

Fix some very simple, low hanging fruit issues
that semgrep is finding in the indexer.

There are some more issues, but they have a larger
scope.
Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent 0b30ae05
---
'@eth-optimism/indexer': patch
---
Fix a couple semgrep issues
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"math/big" "math/big"
"net"
"net/http" "net/http"
"os" "os"
"strconv" "strconv"
...@@ -234,7 +235,7 @@ func (b *Indexer) Serve() error { ...@@ -234,7 +235,7 @@ func (b *Indexer) Serve() error {
middleware := server.LoggingMiddleware(b.metrics, log.New("service", "server")) middleware := server.LoggingMiddleware(b.metrics, log.New("service", "server"))
port := strconv.FormatUint(b.cfg.RESTPort, 10) port := strconv.FormatUint(b.cfg.RESTPort, 10)
addr := fmt.Sprintf("%s:%s", b.cfg.RESTHostname, port) addr := net.JoinHostPort(b.cfg.RESTHostname, port)
log.Info("indexer REST server listening on", "addr", addr) log.Info("indexer REST server listening on", "addr", addr)
return http.ListenAndServe(addr, middleware(c.Handler(b.router))) return http.ListenAndServe(addr, middleware(c.Handler(b.router)))
......
package metrics package metrics
import ( import (
"fmt" "net"
"net/http" "net/http"
"strconv" "strconv"
"time" "time"
...@@ -218,7 +218,7 @@ func (m *Metrics) Serve(hostname string, port uint64) (*http.Server, error) { ...@@ -218,7 +218,7 @@ func (m *Metrics) Serve(hostname string, port uint64) (*http.Server, error) {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.Handle("/metrics", promhttp.Handler()) mux.Handle("/metrics", promhttp.Handler())
srv := new(http.Server) srv := new(http.Server)
srv.Addr = fmt.Sprintf("%s:%d", hostname, port) srv.Addr = net.JoinHostPort(hostname, strconv.FormatUint(port, 10))
srv.Handler = mux srv.Handler = mux
err := srv.ListenAndServe() err := srv.ListenAndServe()
return srv, err return srv, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment