From 0734c4b82050fd8114bb18514191cb5c7ccf5259 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 23 Mar 2020 16:26:56 +0100
Subject: [PATCH] node, cmd/clef: report actual port used for http rpc (#20789)
---
cmd/clef/main.go | 4 ++--
node/node.go | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/cmd/clef/main.go b/cmd/clef/main.go
index b2c8812ab..dd898871d 100644
--- a/cmd/clef/main.go
+++ b/cmd/clef/main.go
@@ -545,12 +545,12 @@ func signer(c *cli.Context) error {
if err != nil {
utils.Fatalf("Could not start RPC api: %v", err)
}
- extapiURL = fmt.Sprintf("http://%s", httpEndpoint)
+ extapiURL = fmt.Sprintf("http://%v/", listener.Addr())
log.Info("HTTP endpoint opened", "url", extapiURL)
defer func() {
listener.Close()
- log.Info("HTTP endpoint closed", "url", httpEndpoint)
+ log.Info("HTTP endpoint closed", "url", extapiURL)
}()
}
if !c.GlobalBool(utils.IPCDisabledFlag.Name) {
diff --git a/node/node.go b/node/node.go
index 1bdd5af7d..7d8f9b07b 100644
--- a/node/node.go
+++ b/node/node.go
@@ -368,7 +368,9 @@ func (n *Node) startHTTP(endpoint string, apis []rpc.API, modules []string, cors
if err != nil {
return err
}
- n.log.Info("HTTP endpoint opened", "url", fmt.Sprintf("http://%s", endpoint), "cors", strings.Join(cors, ","), "vhosts", strings.Join(vhosts, ","))
+ n.log.Info("HTTP endpoint opened", "url", fmt.Sprintf("http://%v/", listener.Addr()),
+ "cors", strings.Join(cors, ","),
+ "vhosts", strings.Join(vhosts, ","))
// All listeners booted successfully
n.httpEndpoint = endpoint
n.httpListener = listener
@@ -380,10 +382,10 @@ func (n *Node) startHTTP(endpoint string, apis []rpc.API, modules []string, cors
// stopHTTP terminates the HTTP RPC endpoint.
func (n *Node) stopHTTP() {
if n.httpListener != nil {
+ url := fmt.Sprintf("http://%v/", n.httpListener.Addr())
n.httpListener.Close()
n.httpListener = nil
-
- n.log.Info("HTTP endpoint closed", "url", fmt.Sprintf("http://%s", n.httpEndpoint))
+ n.log.Info("HTTP endpoint closed", "url", url)
}
if n.httpHandler != nil {
n.httpHandler.Stop()
--
GitLab