Improve listen address output

gnolang · Sep 16, 2023 · 934303e · 934303e
1 parent db1c052
commit 934303e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/cmd/serve.go b/cmd/serve.go
@@ -26,7 +26,7 @@ const (
 	envPrefix      = "GNO_FAUCET"
 )
 
-var (
+const (
 	defaultGasFee    = "1000000ugnot"
 	defaultGasWanted = "100000"
 	defaultRemote    = "http://127.0.0.1:26657"

diff --git a/faucet.go b/faucet.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net"
 	"net/http"
 	"time"
 
@@ -112,15 +113,21 @@ func (f *Faucet) Serve(ctx context.Context) error {
 	group, gCtx := errgroup.WithContext(ctx)
 
 	group.Go(func() error {
+		defer f.logger.Info("faucet shut down")
+
+		ln, err := net.Listen("tcp", faucet.Addr)
+		if err != nil {
+			return err
+		}
+
 		f.logger.Info(
 			fmt.Sprintf(
 				"faucet started at %s",
-				f.config.ListenAddress,
+				ln.Addr().String(),
 			),
 		)
-		defer f.logger.Info("faucet shut down")
 
-		if err := faucet.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+		if err := faucet.Serve(ln); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			return err
 		}