test: ≥95% coverage — daemon 96.9% (go), web 95.5-99% (vitest 142 tests); store.ts hooks-order crash fix
This commit is contained in:
+31
-10
@@ -5,6 +5,7 @@ package main
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
@@ -26,12 +27,23 @@ const (
|
||||
)
|
||||
|
||||
func main() {
|
||||
if err := run(os.Args[1:]); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
// run is the testable main: parses args, wires the server, blocks on SIGINT/
|
||||
// SIGTERM, then shuts down. Split out of main for coverage of the wiring.
|
||||
func run(args []string) error {
|
||||
fs := flag.NewFlagSet("lvmh-daemon", flag.ContinueOnError)
|
||||
var (
|
||||
addr = flag.String("addr", defaultListenAddr, "listen address")
|
||||
dbPath = flag.String("db", envOr(envDB, defaultDBPath), "sqlite database path")
|
||||
webdist = flag.String("webdist", webDistDefault, "serve web UI from this directory instead of the embedded build")
|
||||
addr = fs.String("addr", defaultListenAddr, "listen address")
|
||||
dbPath = fs.String("db", envOr(envDB, defaultDBPath), "sqlite database path")
|
||||
webdist = fs.String("webdist", webDistDefault, "serve web UI from this directory instead of the embedded build")
|
||||
)
|
||||
flag.Parse()
|
||||
if err := fs.Parse(args); err != nil {
|
||||
return err
|
||||
}
|
||||
// Fall back to the embedded UI when the override directory is absent.
|
||||
if st, err := os.Stat(*webdist); err != nil || !st.IsDir() {
|
||||
*webdist = ""
|
||||
@@ -39,17 +51,17 @@ func main() {
|
||||
|
||||
daemonToken = os.Getenv(envToken)
|
||||
if daemonToken == "" {
|
||||
log.Fatalf("LVMH_TOKEN must be set")
|
||||
return fmt.Errorf("LVMH_TOKEN must be set")
|
||||
}
|
||||
|
||||
if dir := filepath.Dir(*dbPath); dir != "" && dir != "." {
|
||||
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||
log.Fatalf("create db dir: %v", err)
|
||||
return fmt.Errorf("create db dir: %w", err)
|
||||
}
|
||||
}
|
||||
store, err := OpenStore(*dbPath)
|
||||
if err != nil {
|
||||
log.Fatalf("open store: %v", err)
|
||||
return fmt.Errorf("open store: %w", err)
|
||||
}
|
||||
defer store.Close()
|
||||
|
||||
@@ -57,7 +69,7 @@ func main() {
|
||||
gitlab := NewGitLab(store, envOr(envGitLabBaseURL, defaultGitLabBase))
|
||||
spawner, err := NewSpawner(store, hub, envOr(envGitLabBaseURL, defaultGitLabBase))
|
||||
if err != nil {
|
||||
log.Fatalf("docker client: %v", err)
|
||||
return fmt.Errorf("docker client: %w", err)
|
||||
}
|
||||
|
||||
srv := NewServer(store, hub, spawner, gitlab)
|
||||
@@ -67,20 +79,29 @@ func main() {
|
||||
ReadHeaderTimeout: 10 * time.Second,
|
||||
}
|
||||
|
||||
serveErr := make(chan error, 1)
|
||||
go func() {
|
||||
log.Printf("lvmh daemon listening on %s (db %s)", *addr, *dbPath)
|
||||
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
||||
log.Fatalf("listen: %v", err)
|
||||
serveErr <- err
|
||||
return
|
||||
}
|
||||
serveErr <- nil
|
||||
}()
|
||||
|
||||
stop := make(chan os.Signal, 1)
|
||||
signal.Notify(stop, os.Interrupt, syscall.SIGTERM)
|
||||
<-stop
|
||||
defer signal.Stop(stop)
|
||||
select {
|
||||
case err := <-serveErr:
|
||||
return fmt.Errorf("listen: %w", err)
|
||||
case <-stop:
|
||||
}
|
||||
log.Printf("shutting down")
|
||||
ctx, cancel := context.WithTimeout(context.Background(), shutdownGrace)
|
||||
defer cancel()
|
||||
if err := httpServer.Shutdown(ctx); err != nil {
|
||||
log.Printf("shutdown: %v", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user