From 2c83cd5627c4abd26c11938eec9590df52cabb51 Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Mon, 12 Jan 2015 01:05:15 -0800 Subject: [PATCH] daemon: only try gateway addr if there --- cmd/ipfs/daemon.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index af0b3a8d7..bbf880f4d 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -111,11 +111,14 @@ func daemonFunc(req cmds.Request) (interface{}, error) { return nil, err } - // ignore error for gateway address - // if there is an error (invalid address), then don't run the gateway - gatewayMaddr, _ := ma.NewMultiaddr(cfg.Addresses.Gateway) - if gatewayMaddr == nil { - fmt.Println("Invalid gateway address, not running gateway") + var gatewayMaddr ma.Multiaddr + if len(cfg.Addresses.Gateway) > 0 { + // ignore error for gateway address + // if there is an error (invalid address), then don't run the gateway + gatewayMaddr, _ = ma.NewMultiaddr(cfg.Addresses.Gateway) + if gatewayMaddr == nil { + log.Errorf("Invalid gateway address: %s", cfg.Addresses.Gateway) + } } // mount if the user provided the --mount flag