log the error that was returned while trying to log an error
This commit is contained in:
parent
e38d42f6cd
commit
a2b9a067a3
@ -93,7 +93,7 @@ func handlePanic(err error) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Debug(err.Error())
|
Debug(err.Error())
|
||||||
return logPanic(err)
|
return logPanic(err, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
func logEnv(w io.Writer) {
|
func logEnv(w io.Writer) {
|
||||||
@ -102,7 +102,7 @@ func logEnv(w io.Writer) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func logPanic(loggedError error) string {
|
func logPanic(loggedError error, recursive bool) string {
|
||||||
var fmtWriter io.Writer = os.Stderr
|
var fmtWriter io.Writer = os.Stderr
|
||||||
|
|
||||||
if err := os.MkdirAll(gitmedia.LocalLogDir, 0755); err != nil {
|
if err := os.MkdirAll(gitmedia.LocalLogDir, 0755); err != nil {
|
||||||
@ -115,9 +115,7 @@ func logPanic(loggedError error) string {
|
|||||||
full := filepath.Join(gitmedia.LocalLogDir, name+".log")
|
full := filepath.Join(gitmedia.LocalLogDir, name+".log")
|
||||||
|
|
||||||
file, err := os.Create(full)
|
file, err := os.Create(full)
|
||||||
if err != nil {
|
if err == nil {
|
||||||
fmt.Fprintf(fmtWriter, "Unable to log panic to %s\n\n", full)
|
|
||||||
} else {
|
|
||||||
fmtWriter = file
|
fmtWriter = file
|
||||||
defer file.Close()
|
defer file.Close()
|
||||||
}
|
}
|
||||||
@ -137,6 +135,11 @@ func logPanic(loggedError error) string {
|
|||||||
fmt.Fprintln(fmtWriter, loggedError.Error())
|
fmt.Fprintln(fmtWriter, loggedError.Error())
|
||||||
fmtWriter.Write(debug.Stack())
|
fmtWriter.Write(debug.Stack())
|
||||||
|
|
||||||
|
if err != nil && !recursive {
|
||||||
|
fmt.Fprintf(fmtWriter, "Unable to log panic to %s\n\n", full)
|
||||||
|
logPanic(err, true)
|
||||||
|
}
|
||||||
|
|
||||||
return full
|
return full
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user