Skip to content

Commit

Permalink
fix crash report
Browse files Browse the repository at this point in the history
  • Loading branch information
alireza0 committed Nov 25, 2024
1 parent f2329c2 commit 3a7c00f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
18 changes: 15 additions & 3 deletions xray/log_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,24 @@ type LogWriter struct {
}

func (lw *LogWriter) Write(m []byte) (n int, err error) {
regex := regexp.MustCompile(`^(\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}) \[([^\]]+)\] (.+)$`)
crashRegex := regexp.MustCompile(`(?i)(panic|exception|stack trace|fatal error)`)

// Convert the data to a string
message := strings.TrimSpace(string(m))

// Check if the message contains a crash
if crashRegex.MatchString(message) {
logger.Debug("Core crash detected:\n", message)
lw.lastLine = message
err1 := writeCrachReport(m)
if err1 != nil {
logger.Error("Unable to write crash report:", err1)
}
return len(m), nil
}

regex := regexp.MustCompile(`^(\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}) \[([^\]]+)\] (.+)$`)
messages := strings.Split(message, "\n")
lw.lastLine = messages[len(messages)-1]

for _, msg := range messages {
matches := regex.FindStringSubmatch(msg)
Expand All @@ -44,9 +55,10 @@ func (lw *LogWriter) Write(m []byte) (n int, err error) {
default:
logger.Debug("XRAY: " + msg)
}
lw.lastLine = ""
} else if msg != "" {
logger.Debug("XRAY: " + msg)
return len(m), nil
lw.lastLine = msg
}
}

Expand Down
5 changes: 2 additions & 3 deletions xray/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ func (p *process) Start() (err error) {
if err != nil {
logger.Error("Failure in running xray-core: ", err)
p.exitErr = err
p.witeCrachReport(err)
}
}()

Expand All @@ -193,7 +192,7 @@ func (p *process) Stop() error {
return p.cmd.Process.Signal(syscall.SIGTERM)
}

func (p *process) witeCrachReport(err error) error {
func writeCrachReport(m []byte) error {
crashReportPath := config.GetBinFolderPath() + "/core_crash_" + time.Now().Format("20060102_150405") + ".log"
return os.WriteFile(crashReportPath, []byte(err.Error()), os.ModePerm)
return os.WriteFile(crashReportPath, m, os.ModePerm)
}

0 comments on commit 3a7c00f

Please sign in to comment.