Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-08-10 13:46:46 +02:00
Code Issues Projects Releases Wiki Activity

cmd/hi: extract artifacts as directories instead of tar files

Browse Source 
- Change profile extraction from .pprof file to -pprof/ directory
- Change mapresponses extraction from .mapresp file to -mapresponses/ directory
- Update artifact listing to show directories with trailing slash
- Improve organization by separating logs from data artifacts
This commit is contained in:
Kristoffer Dalby 2025-06-19 15:26:42 +02:00
parent 3c8e194d8b
commit 4205d3c1b0
No known key found for this signature in database
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/hi/docker.go
View File

@ -416,24 +416,29 @@ func listControlFiles(logsDir string) {
} }
var logFiles []string var logFiles []string
var tarFiles []string var dataFiles []string
var dataDirs []string
for _, entry := range entries { for _, entry := range entries {
if entry.IsDir() {
continue
}
name := entry.Name() name := entry.Name()
// Only show headscale (hs-*) files // Only show headscale (hs-*) files and directories
if !strings.HasPrefix(name, "hs-") { if !strings.HasPrefix(name, "hs-") {
continue continue
} }
if entry.IsDir() {
// Include directories (pprof, mapresponses)
if strings.Contains(name, "-pprof") || strings.Contains(name, "-mapresponses") {
dataDirs = append(dataDirs, name)
}
} else {
// Include files
switch { switch {
case strings.HasSuffix(name, ".stderr.log") || strings.HasSuffix(name, ".stdout.log"): case strings.HasSuffix(name, ".stderr.log") || strings.HasSuffix(name, ".stdout.log"):
logFiles = append(logFiles, name) logFiles = append(logFiles, name)
case strings.HasSuffix(name, ".db") || strings.HasSuffix(name, ".pprof") || strings.HasSuffix(name, ".mapresp"): case strings.HasSuffix(name, ".db"):
tarFiles = append(tarFiles, name) dataFiles = append(dataFiles, name)
}
} }
} }
@ -446,11 +451,14 @@ func listControlFiles(logsDir string) {
} }
} }
if len(tarFiles) > 0 { if len(dataFiles) > 0 || len(dataDirs) > 0 {
log.Printf("Headscale files:") log.Printf("Headscale data:")
for _, file := range tarFiles { for _, file := range dataFiles {
log.Printf(" %s", file) log.Printf(" %s", file)
} }
for _, dir := range dataDirs {
log.Printf(" %s/", dir)
}
} }
} }
@ -624,12 +632,12 @@ func extractContainerFiles(ctx context.Context, cli *client.Client, containerID,
} }
// Extract profile directory // Extract profile directory
if err := extractDirectory(ctx, cli, containerID, "/tmp/profile", containerName+".pprof", logsDir, verbose); err != nil { if err := extractDirectory(ctx, cli, containerID, "/tmp/profile", containerName+"-pprof", logsDir, verbose); err != nil {
logExtractionError("profile directory", containerName, err, verbose) logExtractionError("profile directory", containerName, err, verbose)
} }
// Extract map responses directory // Extract map responses directory
if err := extractDirectory(ctx, cli, containerID, "/tmp/mapresponses", containerName+".mapresp", logsDir, verbose); err != nil { if err := extractDirectory(ctx, cli, containerID, "/tmp/mapresponses", containerName+"-mapresponses", logsDir, verbose); err != nil {
logExtractionError("mapresponses directory", containerName, err, verbose) logExtractionError("mapresponses directory", containerName, err, verbose)
} }