Skip to content

fix AutoRelay default zero value #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aojea merged 3 commits into from
Jun 21, 2026
+34 −22
Merged

fix AutoRelay default zero value #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccd089b
fix AutoRelay default zero value
aojea Jun 21, 2026
0963aa5
fix AutoRelay params in remaining NewSamNode calls
aojea Jun 21, 2026
b0c8843
Update cmd/sam-node/main.go
aojea Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 33 additions & 21 deletions cmd/sam-node/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,15 @@ func main() {
MeshID: meshFlag,
DiscoveryInterval: discoveryIntervalFlag,
ListenAddrs: listenAddrs,
EnableRelay: enableRelayFlag,
NodeConfig: nodeConfig,
KeyGracePeriod: keyGracePeriodFlag,
AllowLoopback: allowLoopbackFlag,
MonitorBootstrap: monitorBootstrapFlag,
MonitorInterval: monitorCheckIntervalFlag,
EnableRelay: enableRelayFlag,
NodeConfig: nodeConfig,
KeyGracePeriod: keyGracePeriodFlag,
AllowLoopback: allowLoopbackFlag,
MonitorBootstrap: monitorBootstrapFlag,
MonitorInterval: monitorCheckIntervalFlag,
AutoRelayMinInterval: autoRelayMinIntervalFlag,
AutoRelayBootDelay: autoRelayBootDelayFlag,
AutoRelayBackoff: autoRelayBackoffFlag,
Comment thread
aojea marked this conversation as resolved.
})
if err != nil {
logger.Fatalf("Failed to start mesh node: %v", err)
Expand Down Expand Up @@ -243,11 +246,14 @@ func main() {
DiscoveryInterval: discoveryIntervalFlag,
ListenAddrs: listenAddrs,
EnableRelay: enableRelayFlag,
NodeConfig: nodeConfig,
KeyGracePeriod: keyGracePeriodFlag,
AllowLoopback: allowLoopbackFlag,
MonitorBootstrap: monitorBootstrapFlag,
MonitorInterval: monitorCheckIntervalFlag,
NodeConfig: nodeConfig,
KeyGracePeriod: keyGracePeriodFlag,
AllowLoopback: allowLoopbackFlag,
MonitorBootstrap: monitorBootstrapFlag,
MonitorInterval: monitorCheckIntervalFlag,
AutoRelayMinInterval: autoRelayMinIntervalFlag,
AutoRelayBootDelay: autoRelayBootDelayFlag,
AutoRelayBackoff: autoRelayBackoffFlag,
})
if err != nil {
enrollCancel()
Expand Down Expand Up @@ -287,11 +293,14 @@ func main() {
DiscoveryInterval: discoveryIntervalFlag,
ListenAddrs: listenAddrs,
EnableRelay: enableRelayFlag,
NodeConfig: nodeConfig,
KeyGracePeriod: keyGracePeriodFlag,
AllowLoopback: allowLoopbackFlag,
MonitorBootstrap: monitorBootstrapFlag,
MonitorInterval: monitorCheckIntervalFlag,
NodeConfig: nodeConfig,
KeyGracePeriod: keyGracePeriodFlag,
AllowLoopback: allowLoopbackFlag,
MonitorBootstrap: monitorBootstrapFlag,
MonitorInterval: monitorCheckIntervalFlag,
AutoRelayMinInterval: autoRelayMinIntervalFlag,
AutoRelayBootDelay: autoRelayBootDelayFlag,
AutoRelayBackoff: autoRelayBackoffFlag,
})
if err != nil {
logger.Fatalf("Failed to start mesh node after enrollment: %v", err)
Expand Down Expand Up @@ -431,11 +440,14 @@ func main() {
DiscoveryInterval: discoveryIntervalFlag,
ListenAddrs: []string{"/ip4/0.0.0.0/udp/0/quic-v1", "/ip4/0.0.0.0/tcp/0"},
EnableRelay: enableRelayFlag,
NodeConfig: nodeConfig,
KeyGracePeriod: keyGracePeriodFlag,
AllowLoopback: allowLoopbackFlag,
MonitorBootstrap: 2 * time.Minute,
MonitorInterval: 1 * time.Minute,
NodeConfig: nodeConfig,
KeyGracePeriod: keyGracePeriodFlag,
AllowLoopback: allowLoopbackFlag,
MonitorBootstrap: 2 * time.Minute,
MonitorInterval: 1 * time.Minute,
AutoRelayMinInterval: 30 * time.Second,
AutoRelayBootDelay: 0 * time.Second,
AutoRelayBackoff: 3 * time.Second,
})
if err != nil {
logger.Fatalf("Failed to initialize node for enrollment: %v", err)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/failover_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ roles: {}
"--allow-loopback",
"--monitor-bootstrap", "1s",
"--monitor-interval", "1s",
"--autorelay-min-interval", "0s",
"--autorelay-min-interval", "1s",
"--autorelay-backoff", "1s",
"--autorelay-boot-delay", "0s",
)
Expand Down
Loading