beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

awslogs: refactor create()

Browse source 
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 {
> 		       ^

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2019-08-05 17:37:57 -07:00 committed by Sebastiaan van Stijn
parent ef2872132d
commit 2e0cafb01b
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
daemon/logger/awslogs/cloudwatchlogs.go
View file

@ -436,25 +436,20 @@ 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 {
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")
}
return nil
}
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")
}
if err != nil {
return errors.Wrap(err, "failed to create Cloudwatch log stream")
err = l.createLogStream()
if err == nil {
return nil
}
}
return nil
return errors.Wrap(err, "failed to create Cloudwatch log stream")
}
// createLogGroup creates a log group for the instance of the awslogs logging driver