Don't cause a double stacktrace on certain errors

This commit is contained in:
Dane Everitt
2020-06-22 20:41:45 -07:00
parent d91de3d912
commit db31722cfc
2 changed files with 21 additions and 5 deletions

View File

@@ -27,10 +27,16 @@ func (s *Server) Install() error {
s.Log().Debug("notifying panel of server install state")
if serr := s.SyncInstallState(err == nil); serr != nil {
s.Log().WithFields(log.Fields{
"was_successful": err == nil,
"error": serr,
}).Warn("failed to notify panel of server install state")
l := s.Log().WithField("was_successful", err == nil)
// If the request was successful but there was an error with this request, attach the
// error to this log entry. Otherwise ignore it in this log since whatever is calling
// this function should handle the error and will end up logging the same one.
if err == nil {
l.WithField("error", serr)
}
l.Warn("failed to notify panel of server install state")
}
return err