mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(server): Handle non-error errors safely

Browse source 
This case should not be possible unless something manually constructs
a logrus entry with a non-error value in the log.ErrorKey field, but
it's better to be safe than sorry.
This commit is contained in:
Vincent Ambo 2019-10-28 22:38:27 +01:00 committed by Vincent Ambo
parent 3a7c964a22
commit 904c3dade0
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/nixery/server/logs.go
View file

@ -76,11 +76,12 @@ func (f stackdriverFormatter) Format(e *log.Entry) ([]byte, error) {
msg["eventTime"] = &e.Time msg["eventTime"] = &e.Time
msg["severity"] = logSeverity(e.Level) msg["severity"] = logSeverity(e.Level)
if err, ok := msg[log.ErrorKey]; ok { if e, ok := msg[log.ErrorKey]; ok {
// TODO(tazjin): Cast safely - for now there should be if err, isError := e.(error); isError {
// no calls to `.WithError` with a nil error, but who msg[log.ErrorKey] = err.Error()
// knows. } else {
msg[log.ErrorKey] = (err.(error)).Error() delete(msg, log.ErrorKey)
}
} }
if isError(e) { if isError(e) {