Skip to content

Commit 4adc4d3

Browse files
committed
refactor: log error on missing relay subsystem
This logs an error when Relay transport or client dependency is missing.
1 parent c158116 commit 4adc4d3

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

core/node/groups.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,18 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option {
112112
}
113113

114114
enableRelayTransport := cfg.Swarm.Transports.Network.Relay.WithDefault(true) //nolint
115-
enableRelayService := cfg.Swarm.RelayService.Enabled.WithDefault(true)
116-
enableRelayClient := cfg.Swarm.RelayClient.Enabled.WithDefault(true)
115+
enableRelayService := cfg.Swarm.RelayService.Enabled.WithDefault(enableRelayTransport)
116+
enableRelayClient := cfg.Swarm.RelayClient.Enabled.WithDefault(enableRelayTransport)
117+
118+
// Log error when relay subsystem could not be initialized
119+
if !enableRelayTransport {
120+
if cfg.Swarm.RelayService.Enabled.WithDefault(true) {
121+
logger.Error("Failed to enable `Swarm.RelayService.Enabled`, it requires `Swarm.Transports.Network.Relay` to be true.")
122+
}
123+
if cfg.Swarm.RelayClient.Enabled.WithDefault(true) {
124+
logger.Error("Failed to enable `Swarm.RelayClient.Enabled`, it requires `Swarm.Transports.Network.Relay` to be true.")
125+
}
126+
}
117127

118128
// Force users to migrate old config.
119129
//nolint

core/node/libp2p/relay.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ func HolePunching(flag config.Flag, hasRelayClient bool) func() (opts Libp2pOpts
7575
return func() (opts Libp2pOpts, err error) {
7676
if flag.WithDefault(true) {
7777
if !hasRelayClient {
78-
log.Fatal("To enable `Swarm.EnableHolePunching` requires `Swarm.RelayClient.Enabled` to be enabled.")
78+
log.Error("Failed to enable `Swarm.EnableHolePunching`, it requires `Swarm.RelayClient.Enabled` to be true.")
79+
return
7980
}
8081
opts.Opts = append(opts.Opts, libp2p.EnableHolePunching())
8182
}

0 commit comments

Comments
 (0)