refactor: log error on missing relay subsystem

This logs an error when Relay transport or client dependency is missing.
ipfs · Feb 22, 2022 · b3a0b98 · b3a0b98
1 parent c158116
commit b3a0b98
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/core/node/groups.go b/core/node/groups.go
@@ -112,8 +112,18 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option {
 	}
 
 	enableRelayTransport := cfg.Swarm.Transports.Network.Relay.WithDefault(true) //nolint
-	enableRelayService := cfg.Swarm.RelayService.Enabled.WithDefault(true)
-	enableRelayClient := cfg.Swarm.RelayClient.Enabled.WithDefault(true)
+	enableRelayService := cfg.Swarm.RelayService.Enabled.WithDefault(enableRelayTransport)
+	enableRelayClient := cfg.Swarm.RelayClient.Enabled.WithDefault(enableRelayTransport)
+
+	// Log error when relay subsystem could not be initialized
+	if !enableRelayTransport {
+		if cfg.Swarm.RelayService.Enabled.WithDefault(true) {
+			log.Error("Failed to enable `Swarm.RelayService.Enabled`, it requires `Swarm.Transports.Network.Relay` to be true.")
+		}
+		if cfg.Swarm.RelayClient.Enabled.WithDefault(true) {
+			log.Error("Failed to enable `Swarm.RelayClient.Enabled`, it requires `Swarm.Transports.Network.Relay` to be true.")
+		}
+	}
 
 	// Force users to migrate old config.
 	//nolint

diff --git a/core/node/libp2p/relay.go b/core/node/libp2p/relay.go
@@ -75,7 +75,8 @@ func HolePunching(flag config.Flag, hasRelayClient bool) func() (opts Libp2pOpts
 	return func() (opts Libp2pOpts, err error) {
 		if flag.WithDefault(true) {
 			if !hasRelayClient {
-				log.Fatal("To enable `Swarm.EnableHolePunching` requires `Swarm.RelayClient.Enabled` to be enabled.")
+				log.Error("Failed to enable `Swarm.EnableHolePunching`, it requires `Swarm.RelayClient.Enabled` to be true.")
+				return
 			}
 			opts.Opts = append(opts.Opts, libp2p.EnableHolePunching())
 		}