customer-engineering/wallarm
3
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: remove goroutine timeout, registration takes 30-60s normally

Browse source
This commit is contained in:
admin 2026-08-01 20:29:47 +00:00
parent da56eaf164
commit e4b1021c52
2 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/deploy/main.go
View file

@ -201,6 +201,7 @@ WALLARM_REGION=%s
return
}
fmt.Printf("Installing %d node(s)...\n", len(s.Nodes))
for _, node := range s.Nodes {
if err := native.InstallNode(node, s.APIToken, s.APIHost, labels); err != nil {
fmt.Fprintf(os.Stderr, "Deployment failed: %v\n", err)

24
internal/native/native.go
View file

@ -83,30 +83,14 @@ func InstallNode(node state.Node, apiToken, apiHost, labels string) error {
exec.Command("bash", filepath.Join(DeployTo, "pick-module.sh")).Run()
fmt.Printf("[%s] Registering node...\n", node.Name)
fmt.Printf("[%s] Registering node...\n", node.Name)
fmt.Printf("[%s] Registering node (this may take 30-60s)...\n", node.Name)
registerCmd := exec.Command("bash", "-c",
fmt.Sprintf("source %s/env.list 2>/dev/null; %s/register-node job:register -token '%s' -host '%s'",
DeployTo, DeployTo, apiToken, apiHost))
registerCmd.Dir = DeployTo
// Run with explicit timeout
type result struct {
out []byte
err error
}
ch := make(chan result, 1)
go func() {
out, err := registerCmd.CombinedOutput()
ch <- result{out, err}
}()
select {
case r := <-ch:
if r.err != nil {
return fmt.Errorf("register: %w\n%s", r.err, string(r.out))
}
case <-time.After(60 * time.Second):
registerCmd.Process.Kill()
return fmt.Errorf("registration timed out")
out, regErr := registerCmd.CombinedOutput()
if regErr != nil {
return fmt.Errorf("register: %w\n%s", regErr, string(out))
}
// 7. Stop our temporary NGINX, start Wallarm via supervisord