From 753066b8cd4fcad46b3d9486eab304e5721ae9ff Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Fri, 24 Feb 2017 15:25:09 +0100 Subject: [PATCH] daemon: move gateway start to latter To prevent panic when daemon closes early. License: MIT Signed-off-by: Jakub Sztandera --- cmd/ipfs/daemon.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 09a63d293..c00cb1018 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -372,17 +372,6 @@ func daemonFunc(req cmds.Request, res cmds.Response) { return } - // construct http gateway - if it is set in the config - var gwErrc <-chan error - if len(cfg.Addresses.Gateway) > 0 { - var err error - err, gwErrc = serveHTTPGateway(req) - if err != nil { - res.SetError(err, cmds.ErrNormal) - return - } - } - // construct fuse mountpoints - if the user provided the --mount flag mount, _, err := req.Option(mountKwd).Bool() if err != nil { @@ -408,6 +397,17 @@ func daemonFunc(req cmds.Request, res cmds.Response) { return } + // construct http gateway - if it is set in the config + var gwErrc <-chan error + if len(cfg.Addresses.Gateway) > 0 { + var err error + err, gwErrc = serveHTTPGateway(req) + if err != nil { + res.SetError(err, cmds.ErrNormal) + return + } + } + // initialize metrics collector prometheus.MustRegister(&corehttp.IpfsNodeCollector{Node: node})