Pim van Pelt
3bd30b69f4
maglevc - Rewrite '?' handler (birdc-style): show full command paths from current position to every leaf, right-aligned help column, dynamic slot values displayed as an indented block when cursor is at a slot position. - Collapse show frontends/frontend, backends/backend, healthchecks/healthcheck into single plural-noun nodes with an optional <name> slot. Allows 'sh ba' (list all) and 'sh ba nginx0' (show one) without ambiguity. - Add 'config reload' command. - Fix tabwriter ANSI alignment: continuation lines in transition output now carry the same label() byte overhead as the header line. - Fix broken Walk for 'set frontend' command: setFrontendPoolName and setWeightValue were fixed-word nodes that couldn't capture user input; mark them as slot nodes with dynNone. - Add tree_test.go covering expandPaths, cycle detection, prefix matching, and the full weight-command walk. gRPC / proto - Add ReloadConfig RPC: checks config then applies it to the running checker, returning ok/parse_error/semantic_error/reload_error. - Add logging to CheckConfig (config-check-start/config-check-done at INFO level). maglevd - SIGHUP handler now calls maglevServer.TriggerReload(), sharing the same code path as the gRPC ReloadConfig RPC. docs - Collapse show command documentation to use [<name>] optional syntax. - Remove developer-facing 'Command tree and parser' section. - Document 'config reload'.
104 lines
2.1 KiB
Go
104 lines
2.1 KiB
Go
// Copyright (c) 2026, Pim van Pelt <pim@ipng.ch>
|
|
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"strings"
|
|
|
|
"github.com/chzyer/readline"
|
|
|
|
"git.ipng.ch/ipng/vpp-maglev/internal/grpcapi"
|
|
)
|
|
|
|
// errQuit is a sentinel returned by runQuit to exit the REPL.
|
|
var errQuit = errors.New("quit")
|
|
|
|
// runShell runs the interactive REPL until the user types quit/exit or EOF.
|
|
func runShell(ctx context.Context, client grpcapi.MaglevClient) error {
|
|
root := buildTree()
|
|
|
|
comp := &Completer{root: root, client: client}
|
|
ql := &questionListener{root: root, client: client}
|
|
|
|
cfg := &readline.Config{
|
|
Prompt: "maglev> ",
|
|
AutoComplete: comp,
|
|
InterruptPrompt: "^C",
|
|
EOFPrompt: "exit",
|
|
Listener: ql,
|
|
}
|
|
rl, err := readline.NewEx(cfg)
|
|
if err != nil {
|
|
return fmt.Errorf("readline init: %w", err)
|
|
}
|
|
ql.rl = rl
|
|
defer rl.Close()
|
|
|
|
for {
|
|
line, err := rl.Readline()
|
|
if err == readline.ErrInterrupt {
|
|
continue
|
|
}
|
|
if err == io.EOF {
|
|
return nil
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
tokens := splitTokens(line)
|
|
if len(tokens) == 0 {
|
|
continue
|
|
}
|
|
|
|
if err := dispatch(ctx, root, client, tokens); err != nil {
|
|
if errors.Is(err, errQuit) {
|
|
return nil
|
|
}
|
|
fmt.Fprintf(rl.Stderr(), "error: %v\n", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// dispatch walks the tree and executes the matched command.
|
|
func dispatch(ctx context.Context, root *Node, client grpcapi.MaglevClient, tokens []string) error {
|
|
node, args := Walk(root, tokens)
|
|
|
|
if node.Run == nil {
|
|
showHelp(root, tokens)
|
|
return nil
|
|
}
|
|
|
|
return node.Run(ctx, client, args)
|
|
}
|
|
|
|
// showHelp prints all reachable commands from the given token path, birdc-style.
|
|
func showHelp(root *Node, tokens []string) {
|
|
node, _ := Walk(root, tokens)
|
|
prefix := strings.Join(tokens, " ")
|
|
lines := expandPaths(node, prefix, make(map[*Node]bool))
|
|
|
|
maxLen := 0
|
|
for _, l := range lines {
|
|
if len(l.path) > maxLen {
|
|
maxLen = len(l.path)
|
|
}
|
|
}
|
|
|
|
if len(lines) == 0 {
|
|
fmt.Println(" <no completions>")
|
|
return
|
|
}
|
|
for _, l := range lines {
|
|
if l.help != "" {
|
|
fmt.Printf("%-*s %s\n", maxLen+2, l.path, l.help)
|
|
} else {
|
|
fmt.Printf("%s\n", l.path)
|
|
}
|
|
}
|
|
}
|