mirror of
https://github.com/netbirdio/netbird.git
synced 2025-01-30 17:58:50 +01:00
[client] Use correct stdout/stderr log paths for debug bundle on macOS (#3231)
This commit is contained in:
parent
aafa9c67fc
commit
3cc485759e
@ -16,6 +16,7 @@ import (
|
|||||||
"net/netip"
|
"net/netip"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
@ -132,6 +133,9 @@ const (
|
|||||||
clientLogFile = "client.log"
|
clientLogFile = "client.log"
|
||||||
errorLogFile = "netbird.err"
|
errorLogFile = "netbird.err"
|
||||||
stdoutLogFile = "netbird.out"
|
stdoutLogFile = "netbird.out"
|
||||||
|
|
||||||
|
darwinErrorLogPath = "/var/log/netbird.out.log"
|
||||||
|
darwinStdoutLogPath = "/var/log/netbird.err.log"
|
||||||
)
|
)
|
||||||
|
|
||||||
// DebugBundle creates a debug bundle and returns the location.
|
// DebugBundle creates a debug bundle and returns the location.
|
||||||
@ -410,12 +414,17 @@ func (s *Server) addLogfile(req *proto.DebugBundleRequest, anonymizer *anonymize
|
|||||||
return fmt.Errorf("add client log file to zip: %w", err)
|
return fmt.Errorf("add client log file to zip: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
errLogPath := filepath.Join(logDir, errorLogFile)
|
stdErrLogPath := filepath.Join(logDir, errorLogFile)
|
||||||
if err := s.addSingleLogfile(errLogPath, errorLogFile, req, anonymizer, archive); err != nil {
|
stdoutLogPath := filepath.Join(logDir, stdoutLogFile)
|
||||||
|
if runtime.GOOS == "darwin" {
|
||||||
|
stdErrLogPath = darwinErrorLogPath
|
||||||
|
stdoutLogPath = darwinStdoutLogPath
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := s.addSingleLogfile(stdErrLogPath, errorLogFile, req, anonymizer, archive); err != nil {
|
||||||
log.Warnf("Failed to add %s to zip: %v", errorLogFile, err)
|
log.Warnf("Failed to add %s to zip: %v", errorLogFile, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
stdoutLogPath := filepath.Join(logDir, stdoutLogFile)
|
|
||||||
if err := s.addSingleLogfile(stdoutLogPath, stdoutLogFile, req, anonymizer, archive); err != nil {
|
if err := s.addSingleLogfile(stdoutLogPath, stdoutLogFile, req, anonymizer, archive); err != nil {
|
||||||
log.Warnf("Failed to add %s to zip: %v", stdoutLogFile, err)
|
log.Warnf("Failed to add %s to zip: %v", stdoutLogFile, err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user