Bladeren bron

Merge pull request #37944 from IRCody/awslogs_error_context

Return more context on awslogs create failure
Sebastiaan van Stijn 6 jaren geleden
bovenliggende
commit
b48bf39a79
1 gewijzigde bestanden met toevoegingen van 7 en 3 verwijderingen
  1. 7 3
      daemon/logger/awslogs/cloudwatchlogs.go

+ 7 - 3
daemon/logger/awslogs/cloudwatchlogs.go

@@ -380,13 +380,17 @@ func (l *logStream) create() error {
 		if l.logCreateGroup {
 		if l.logCreateGroup {
 			if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == resourceNotFoundCode {
 			if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == resourceNotFoundCode {
 				if err := l.createLogGroup(); err != nil {
 				if err := l.createLogGroup(); err != nil {
-					return err
+					return errors.Wrap(err, "failed to create Cloudwatch log group")
 				}
 				}
-				return l.createLogStream()
+				err := l.createLogStream()
+				if err != nil {
+					return errors.Wrap(err, "failed to create Cloudwatch log stream")
+				}
+				return nil
 			}
 			}
 		}
 		}
 		if err != nil {
 		if err != nil {
-			return err
+			return errors.Wrap(err, "failed to create Cloudwatch log stream")
 		}
 		}
 	}
 	}