refactor: rename error dump file

This commit is contained in:
Siyuan 2025-10-10 22:54:35 +00:00
parent ff81768b88
commit a3f7b5e937
1 changed files with 36 additions and 24 deletions

View File

@ -16,10 +16,10 @@ import (
) )
const ( const (
envChildID = "JETKVM_CHILD_ID" envChildID = "JETKVM_CHILD_ID"
errorDumpDir = "/userdata/jetkvm/" errorDumpDir = "/userdata/jetkvm/"
errorDumpStateFile = ".has_error_dump" errorDumpLastFile = "last-crash.log"
errorDumpTemplate = "jetkvm-%s.log" errorDumpTemplate = "jetkvm-%s.log"
) )
func program() { func program() {
@ -140,30 +140,24 @@ func ensureSymlink(dst, src string) error {
return os.Symlink(src, dst) return os.Symlink(src, dst)
} }
func createErrorDump(logFile *os.File) { func renameFile(f *os.File, newName string) error {
logFile.Close() f.Close()
// touch the error dump state file // try to rename the file first
if err := os.WriteFile(filepath.Join(errorDumpDir, errorDumpStateFile), []byte{}, 0644); err != nil { if err := os.Rename(f.Name(), newName); err == nil {
return return nil
} }
fileName := fmt.Sprintf(errorDumpTemplate, time.Now().Format("20060102150405")) // copy the log file to the error dump directory
filePath := filepath.Join(errorDumpDir, fileName) fnSrc, err := os.Open(f.Name())
if err := os.Rename(logFile.Name(), filePath); err == nil {
fmt.Printf("error dump created: %s\n", filePath)
return
}
fnSrc, err := os.Open(logFile.Name())
if err != nil { if err != nil {
return return fmt.Errorf("failed to open file: %w", err)
} }
defer fnSrc.Close() defer fnSrc.Close()
fnDst, err := os.Create(filePath) fnDst, err := os.Create(newName)
if err != nil { if err != nil {
return return fmt.Errorf("failed to create file: %w", err)
} }
defer fnDst.Close() defer fnDst.Close()
@ -171,20 +165,38 @@ func createErrorDump(logFile *os.File) {
for { for {
n, err := fnSrc.Read(buf) n, err := fnSrc.Read(buf)
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
return return fmt.Errorf("failed to read file: %w", err)
} }
if n == 0 { if n == 0 {
break break
} }
if _, err := fnDst.Write(buf[:n]); err != nil { if _, err := fnDst.Write(buf[:n]); err != nil {
return return fmt.Errorf("failed to write file: %w", err)
} }
} }
fmt.Printf("error dump created: %s\n", filePath) return nil
}
_ = ensureSymlink(filePath, filepath.Join(errorDumpDir, "last-crash.log")) func createErrorDump(logFile *os.File) {
fileName := fmt.Sprintf(
errorDumpTemplate,
time.Now().Format("20060102-150405"),
)
filePath := filepath.Join(errorDumpDir, fileName)
if err := renameFile(logFile, filePath); err != nil {
fmt.Printf("failed to rename file: %v\n", err)
return
}
fmt.Printf("error dump copied: %s\n", fileName)
if err := ensureSymlink(filePath, filepath.Join(errorDumpDir, errorDumpLastFile)); err != nil {
fmt.Printf("failed to create symlink: %v\n", err)
return
}
} }
func doSupervise() { func doSupervise() {