Commit be0860ae authored by Sabnock01's avatar Sabnock01

remove generic flags for metrics

parent b211bac5
...@@ -2,12 +2,9 @@ package metrics ...@@ -2,12 +2,9 @@ package metrics
import ( import (
"errors" "errors"
"fmt"
"math" "math"
"strings"
opservice "github.com/ethereum-optimism/optimism/op-service" opservice "github.com/ethereum-optimism/optimism/op-service"
"github.com/ethereum-optimism/optimism/op-service/cliapp"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
...@@ -35,44 +32,21 @@ func CLIFlags(envPrefix string) []cli.Flag { ...@@ -35,44 +32,21 @@ func CLIFlags(envPrefix string) []cli.Flag {
Usage: "Enable the metrics server", Usage: "Enable the metrics server",
EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_ENABLED"), EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_ENABLED"),
}, },
&cli.GenericFlag{ &cli.StringFlag{
Name: ListenAddrFlagName, Name: ListenAddrFlagName,
Usage: "Metrics listening address", Usage: "Metrics listening address",
Value: NewFlagValue(defaultListenAddr), // TODO(CLI-4159): Switch to 127.0.0.1 Value: defaultListenAddr, // TODO(CLI-4159): Switch to 127.0.0.1
EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_ADDR"), EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_ADDR"),
}, },
&cli.GenericFlag{ &cli.IntFlag{
Name: PortFlagName, Name: PortFlagName,
Usage: "Metrics listening port", Usage: "Metrics listening port",
Value: NewFlagValue(fmt.Sprint(defaultListenPort)), Value: defaultListenPort,
EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_PORT"), EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_PORT"),
}, },
} }
} }
type FlagValue string
func NewFlagValue(s string) *FlagValue {
return (*FlagValue)(&s)
}
func (fv *FlagValue) Set(value string) error {
value = strings.ToLower(value) // ignore case
*fv = FlagValue(value)
return nil
}
func (fv FlagValue) String() string {
return string(fv)
}
func (fv *FlagValue) Clone() any {
cpy := *fv
return &cpy
}
var _ cliapp.CloneableGeneric = (*FlagValue)(nil)
type CLIConfig struct { type CLIConfig struct {
Enabled bool Enabled bool
ListenAddr string ListenAddr string
......
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