Explorar o código

awslogs: use github.com/pkg/errors to wrap an error

Signed-off-by: Tibor Vass <tibor@docker.com>
Tibor Vass %!s(int64=8) %!d(string=hai) anos
pai
achega
f775005a17
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      daemon/logger/awslogs/cloudwatchlogs.go

+ 2 - 2
daemon/logger/awslogs/cloudwatchlogs.go

@@ -3,7 +3,6 @@ package awslogs
 
 
 import (
 import (
 	"bytes"
 	"bytes"
-	"errors"
 	"fmt"
 	"fmt"
 	"os"
 	"os"
 	"regexp"
 	"regexp"
@@ -25,6 +24,7 @@ import (
 	"github.com/docker/docker/daemon/logger/loggerutils"
 	"github.com/docker/docker/daemon/logger/loggerutils"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/pkg/templates"
 	"github.com/docker/docker/pkg/templates"
+	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -109,7 +109,7 @@ func parseMultilineOptions(info logger.Info) (*regexp.Regexp, error) {
 	if multilinePatternKey != "" {
 	if multilinePatternKey != "" {
 		multilinePattern, err := regexp.Compile(multilinePatternKey)
 		multilinePattern, err := regexp.Compile(multilinePatternKey)
 		if err != nil {
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrapf(err, "awslogs could not parse multiline pattern key %q", multilinePatternKey)
 		}
 		}
 		return multilinePattern, nil
 		return multilinePattern, nil
 	}
 	}