other: Optimize command line parameter name

ssl-devs -> ssl-cacert Signed-off-by: Jianhui Zhao <[email protected]>
zacobin · Feb 19, 2021 · d12669a · d12669a
1 parent 33731fa
commit d12669a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/config/config.go b/config/config.go
@@ -19,7 +19,7 @@ type Config struct {
 	WebPort      int
 	SslCert      string
 	SslKey       string
-	SslDevices   string
+	SslCacert    string // mTLS for device
 	HTTPUsername string
 	HTTPPassword string
 	Token        string
@@ -50,7 +50,7 @@ func Parse(c *cli.Context) *Config {
 		WebRedirURL:  c.String("web-redir-url"),
 		SslCert:      c.String("ssl-cert"),
 		SslKey:       c.String("ssl-key"),
-		SslDevices:   c.String("ssl-devs"),
+		SslCacert:    c.String("ssl-cacert"),
 		HTTPUsername: c.String("http-username"),
 		HTTPPassword: c.String("http-password"),
 		Token:        c.String("token"),
@@ -76,7 +76,7 @@ func Parse(c *cli.Context) *Config {
 		getConfigOpt(yamlCfg, "web-redir-url", &cfg.WebRedirURL)
 		getConfigOpt(yamlCfg, "ssl-cert", &cfg.SslCert)
 		getConfigOpt(yamlCfg, "ssl-key", &cfg.SslKey)
-		getConfigOpt(yamlCfg, "ssl-devs", &cfg.SslDevices)
+		getConfigOpt(yamlCfg, "ssl-cacert", &cfg.SslCacert)
 		getConfigOpt(yamlCfg, "http-username", &cfg.HTTPUsername)
 		getConfigOpt(yamlCfg, "http-password", &cfg.HTTPPassword)
 		getConfigOpt(yamlCfg, "token", &cfg.Token)

diff --git a/device.go b/device.go
@@ -274,10 +274,10 @@ func listenDevice(br *broker) {
 		tlsConfig.Time = time.Now
 		tlsConfig.Rand = rand.Reader
 
-		if cfg.SslDevices == "" {
+		if cfg.SslCacert == "" {
 			log.Warn().Msgf("mTLS not enabled")
 		} else {
-			caCert, err := ioutil.ReadFile(cfg.SslDevices)
+			caCert, err := ioutil.ReadFile(cfg.SslCacert)
 			if err != nil {
 				log.Error().Msgf("mTLS not enabled: %s", err.Error())
 			} else {

diff --git a/main.go b/main.go
@@ -2,11 +2,11 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/signal"
-	"syscall"
 	"runtime"
-	"io/ioutil"
+	"syscall"
 
 	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
@@ -58,7 +58,7 @@ func runRttys(c *cli.Context) {
 			case syscall.SIGUSR1:
 				if br.devCertPool != nil {
 					log.Info().Msg("Reload certs for mTLS")
-					caCert, err := ioutil.ReadFile(cfg.SslDevices)
+					caCert, err := ioutil.ReadFile(cfg.SslCacert)
 					if err != nil {
 						log.Info().Msgf("mTLS update faled: %s", err.Error())
 					} else {
@@ -131,7 +131,7 @@ func main() {
 						Usage: "ssl key file Path",
 					},
 					&cli.StringFlag{
-						Name:  "ssl-devs",
+						Name:  "ssl-cacert",
 						Value: "",
 						Usage: "mtls CA storage in PEM file Path",
 					},