awslogs: refactor create()
Get rid of too many nested if statements. Remove the redundand check for
err != nil, fixing the following lint issue:
> daemon/logger/awslogs/cloudwatchlogs.go:452:10: nilness: tautological condition: non-nil != nil (govet)
> 		if err != nil {
> 		       ^
@@ -436,26 +436,21 @@ func (l *logStream) Close() error {
// create creates log group and log stream for the instance of the awslogs logging driver
func (l *logStream) create() error {
- if err := l.createLogStream(); err != nil {
- if l.logCreateGroup {
- if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == resourceNotFoundCode {
+ err := l.createLogStream()
+ if err == nil {
+ return nil
+ }
+ if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == resourceNotFoundCode && l.logCreateGroup {
if err := l.createLogGroup(); err != nil {
return errors.Wrap(err, "failed to create Cloudwatch log group")
}
- err := l.createLogStream()
- if err != nil {
- return errors.Wrap(err, "failed to create Cloudwatch log stream")
- }
+ err = l.createLogStream()
+ if err == nil {
return nil
}
}
- if err != nil {
return errors.Wrap(err, "failed to create Cloudwatch log stream")
}
- }
-
- return nil
-}
// createLogGroup creates a log group for the instance of the awslogs logging driver
func (l *logStream) createLogGroup() error {
