Merge pull request #18750 from mingqing/fix-typo-in-server-embed

ahrtr · web-flow · commit c0c57d5584be · 2024-10-18T13:57:13.000+01:00
embed: fix typo client-listen-x to listen-client-x
diff --git a/server/embed/etcd.go b/server/embed/etcd.go
@@ -664,7 +664,7 @@ func configureClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err erro
 			sctx = newServeCtx(cfg.logger)
 			sctxs[addr] = sctx
 		} else if !sctx.httpOnly {
-			return nil, fmt.Errorf("cannot bind both --client-listen-urls and --client-listen-http-urls on the same url %s", u.String())
+			return nil, fmt.Errorf("cannot bind both --listen-client-urls and --listen-client-http-urls on the same url %s", u.String())
 		}
 		sctx.secure = sctx.secure || secure
 		sctx.insecure = sctx.insecure || !secure

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ func configureClientListeners(cfg Config) (sctxs map[string]serveCtx, err erro`
`664`	`664`	`sctx = newServeCtx(cfg.logger)`
`665`	`665`	`sctxs[addr] = sctx`
`666`	`666`	`} else if !sctx.httpOnly {`
`667`		`- return nil, fmt.Errorf("cannot bind both --client-listen-urls and --client-listen-http-urls on the same url %s", u.String())`
	`667`	`+ return nil, fmt.Errorf("cannot bind both --listen-client-urls and --listen-client-http-urls on the same url %s", u.String())`
`668`	`668`	`}`
`669`	`669`	`sctx.secure = sctx.secure \|\| secure`
`670`	`670`	`sctx.insecure = sctx.insecure \|\| !secure`