Skip to content

Commit 4e51d8a

Browse files
Yanqiang Miaoruncom
Yanqiang Miao
authored and
runcom
committed
Rename 'context' to 'loginfo' in the logger module
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> gofmt Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> update Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> remove 'api/types/container/config.go' from this PR Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> change 'LogInfo' to 'Info' Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> update Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
1 parent 812d43f commit 4e51d8a

18 files changed

Lines changed: 191 additions & 191 deletions

File tree

‎container/container.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func (container *Container) StartLogger(cfg containertypes.LogConfig) (logger.Lo
313313
if err != nil {
314314
return nil, fmt.Errorf("Failed to get logging factory: %v", err)
315315
}
316-
ctx := logger.Context{
316+
info := logger.Info{
317317
Config: cfg.Config,
318318
ContainerID: container.ID,
319319
ContainerName: container.Name,
@@ -329,12 +329,12 @@ func (container *Container) StartLogger(cfg containertypes.LogConfig) (logger.Lo
329329

330330
// Set logging file for "json-logger"
331331
if cfg.Type == jsonfilelog.Name {
332-
ctx.LogPath, err = container.GetRootResourcePath(fmt.Sprintf("%s-json.log", container.ID))
332+
info.LogPath, err = container.GetRootResourcePath(fmt.Sprintf("%s-json.log", container.ID))
333333
if err != nil {
334334
return nil, err
335335
}
336336
}
337-
return c(ctx)
337+
return c(info)
338338
}
339339

340340
// GetProcessLabel returns the process label for the container.

‎daemon/logger/awslogs/cloudwatchlogs.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,17 @@ func init() {
8888
// also taken from environment variables AWS_REGION, AWS_ACCESS_KEY_ID,
8989
// AWS_SECRET_ACCESS_KEY, the shared credentials file (~/.aws/credentials), and
9090
// the EC2 Instance Metadata Service.
91-
func New(ctx logger.Context) (logger.Logger, error) {
92-
logGroupName := ctx.Config[logGroupKey]
93-
logStreamName, err := loggerutils.ParseLogTag(ctx, "{{.FullID}}")
91+
func New(info logger.Info) (logger.Logger, error) {
92+
logGroupName := info.Config[logGroupKey]
93+
logStreamName, err := loggerutils.ParseLogTag(info, "{{.FullID}}")
9494
if err != nil {
9595
return nil, err
9696
}
9797

98-
if ctx.Config[logStreamKey] != "" {
99-
logStreamName = ctx.Config[logStreamKey]
98+
if info.Config[logStreamKey] != "" {
99+
logStreamName = info.Config[logStreamKey]
100100
}
101-
client, err := newAWSLogsClient(ctx)
101+
client, err := newAWSLogsClient(info)
102102
if err != nil {
103103
return nil, err
104104
}
@@ -127,13 +127,13 @@ var newRegionFinder = func() regionFinder {
127127
// Customizations to the default client from the SDK include a Docker-specific
128128
// User-Agent string and automatic region detection using the EC2 Instance
129129
// Metadata Service when region is otherwise unspecified.
130-
func newAWSLogsClient(ctx logger.Context) (api, error) {
130+
func newAWSLogsClient(info logger.Info) (api, error) {
131131
var region *string
132132
if os.Getenv(regionEnvKey) != "" {
133133
region = aws.String(os.Getenv(regionEnvKey))
134134
}
135-
if ctx.Config[regionKey] != "" {
136-
region = aws.String(ctx.Config[regionKey])
135+
if info.Config[regionKey] != "" {
136+
region = aws.String(info.Config[regionKey])
137137
}
138138
if region == nil || *region == "" {
139139
logrus.Info("Trying to get region from EC2 Metadata")

‎daemon/logger/awslogs/cloudwatchlogs_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ const (
2828
)
2929

3030
func TestNewAWSLogsClientUserAgentHandler(t *testing.T) {
31-
ctx := logger.Context{
31+
info := logger.Info{
3232
Config: map[string]string{
3333
regionKey: "us-east-1",
3434
},
3535
}
3636

37-
client, err := newAWSLogsClient(ctx)
37+
client, err := newAWSLogsClient(info)
3838
if err != nil {
3939
t.Fatal(err)
4040
}
@@ -59,7 +59,7 @@ func TestNewAWSLogsClientUserAgentHandler(t *testing.T) {
5959
}
6060

6161
func TestNewAWSLogsClientRegionDetect(t *testing.T) {
62-
ctx := logger.Context{
62+
info := logger.Info{
6363
Config: map[string]string{},
6464
}
6565

@@ -71,7 +71,7 @@ func TestNewAWSLogsClientRegionDetect(t *testing.T) {
7171
successResult: "us-east-1",
7272
}
7373

74-
_, err := newAWSLogsClient(ctx)
74+
_, err := newAWSLogsClient(info)
7575
if err != nil {
7676
t.Fatal(err)
7777
}
@@ -695,12 +695,12 @@ func TestCollectBatchWithDuplicateTimestamps(t *testing.T) {
695695

696696
func TestCreateTagSuccess(t *testing.T) {
697697
mockClient := newMockClient()
698-
ctx := logger.Context{
698+
info := logger.Info{
699699
ContainerName: "/test-container",
700700
ContainerID: "container-abcdefghijklmnopqrstuvwxyz01234567890",
701701
Config: map[string]string{"tag": "{{.Name}}/{{.FullID}}"},
702702
}
703-
logStreamName, e := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
703+
logStreamName, e := loggerutils.ParseLogTag(info, loggerutils.DefaultTemplate)
704704
if e != nil {
705705
t.Errorf("Error generating tag: %q", e)
706706
}

‎daemon/logger/etwlogs/etwlogs_windows.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ func init() {
5454
}
5555

5656
// New creates a new etwLogs logger for the given container and registers the EWT provider.
57-
func New(ctx logger.Context) (logger.Logger, error) {
57+
func New(info logger.Info) (logger.Logger, error) {
5858
if err := registerETWProvider(); err != nil {
5959
return nil, err
6060
}
61-
logrus.Debugf("logging driver etwLogs configured for container: %s.", ctx.ContainerID)
61+
logrus.Debugf("logging driver etwLogs configured for container: %s.", info.ContainerID)
6262

6363
return &etwLogs{
64-
containerName: ctx.Name(),
65-
imageName: ctx.ContainerImageName,
66-
containerID: ctx.ContainerID,
67-
imageID: ctx.ContainerImageID,
64+
containerName: info.Name(),
65+
imageName: info.ContainerImageName,
66+
containerID: info.ContainerID,
67+
imageID: info.ContainerImageID,
6868
}, nil
6969
}
7070

‎daemon/logger/factory.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
)
77

88
// Creator builds a logging driver instance with given context.
9-
type Creator func(Context) (Logger, error)
9+
type Creator func(Info) (Logger, error)
1010

1111
// LogOptValidator checks the options specific to the underlying
1212
// logging implementation.

‎daemon/logger/fluentd/fluentd.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,49 +67,49 @@ func init() {
6767
// New creates a fluentd logger using the configuration passed in on
6868
// the context. The supported context configuration variable is
6969
// fluentd-address.
70-
func New(ctx logger.Context) (logger.Logger, error) {
71-
loc, err := parseAddress(ctx.Config[addressKey])
70+
func New(info logger.Info) (logger.Logger, error) {
71+
loc, err := parseAddress(info.Config[addressKey])
7272
if err != nil {
7373
return nil, err
7474
}
7575

76-
tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
76+
tag, err := loggerutils.ParseLogTag(info, loggerutils.DefaultTemplate)
7777
if err != nil {
7878
return nil, err
7979
}
8080

81-
extra := ctx.ExtraAttributes(nil)
81+
extra := info.ExtraAttributes(nil)
8282

8383
bufferLimit := defaultBufferLimit
84-
if ctx.Config[bufferLimitKey] != "" {
85-
bl64, err := units.RAMInBytes(ctx.Config[bufferLimitKey])
84+
if info.Config[bufferLimitKey] != "" {
85+
bl64, err := units.RAMInBytes(info.Config[bufferLimitKey])
8686
if err != nil {
8787
return nil, err
8888
}
8989
bufferLimit = int(bl64)
9090
}
9191

9292
retryWait := defaultRetryWait
93-
if ctx.Config[retryWaitKey] != "" {
94-
rwd, err := time.ParseDuration(ctx.Config[retryWaitKey])
93+
if info.Config[retryWaitKey] != "" {
94+
rwd, err := time.ParseDuration(info.Config[retryWaitKey])
9595
if err != nil {
9696
return nil, err
9797
}
9898
retryWait = int(rwd.Seconds() * 1000)
9999
}
100100

101101
maxRetries := defaultMaxRetries
102-
if ctx.Config[maxRetriesKey] != "" {
103-
mr64, err := strconv.ParseUint(ctx.Config[maxRetriesKey], 10, strconv.IntSize)
102+
if info.Config[maxRetriesKey] != "" {
103+
mr64, err := strconv.ParseUint(info.Config[maxRetriesKey], 10, strconv.IntSize)
104104
if err != nil {
105105
return nil, err
106106
}
107107
maxRetries = int(mr64)
108108
}
109109

110110
asyncConnect := false
111-
if ctx.Config[asyncConnectKey] != "" {
112-
if asyncConnect, err = strconv.ParseBool(ctx.Config[asyncConnectKey]); err != nil {
111+
if info.Config[asyncConnectKey] != "" {
112+
if asyncConnect, err = strconv.ParseBool(info.Config[asyncConnectKey]); err != nil {
113113
return nil, err
114114
}
115115
}
@@ -125,7 +125,7 @@ func New(ctx logger.Context) (logger.Logger, error) {
125125
AsyncConnect: asyncConnect,
126126
}
127127

128-
logrus.WithField("container", ctx.ContainerID).WithField("config", fluentConfig).
128+
logrus.WithField("container", info.ContainerID).WithField("config", fluentConfig).
129129
Debug("logging driver fluentd configured")
130130

131131
log, err := fluent.New(fluentConfig)
@@ -134,8 +134,8 @@ func New(ctx logger.Context) (logger.Logger, error) {
134134
}
135135
return &fluentd{
136136
tag: tag,
137-
containerID: ctx.ContainerID,
138-
containerName: ctx.ContainerName,
137+
containerID: info.ContainerID,
138+
containerName: info.ContainerName,
139139
writer: log,
140140
extra: extra,
141141
}, nil

‎daemon/logger/gcplogs/gcplogging.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ func initGCP() {
100100
// default credentials.
101101
//
102102
// See https://developers.google.com/identity/protocols/application-default-credentials
103-
func New(ctx logger.Context) (logger.Logger, error) {
103+
func New(info logger.Info) (logger.Logger, error) {
104104
initGCP()
105105

106106
var project string
107107
if projectID != "" {
108108
project = projectID
109109
}
110-
if projectID, found := ctx.Config[projectOptKey]; found {
110+
if projectID, found := info.Config[projectOptKey]; found {
111111
project = projectID
112112
}
113113
if project == "" {
@@ -126,17 +126,17 @@ func New(ctx logger.Context) (logger.Logger, error) {
126126
l := &gcplogs{
127127
client: c,
128128
container: &containerInfo{
129-
Name: ctx.ContainerName,
130-
ID: ctx.ContainerID,
131-
ImageName: ctx.ContainerImageName,
132-
ImageID: ctx.ContainerImageID,
133-
Created: ctx.ContainerCreated,
134-
Metadata: ctx.ExtraAttributes(nil),
129+
Name: info.ContainerName,
130+
ID: info.ContainerID,
131+
ImageName: info.ContainerImageName,
132+
ImageID: info.ContainerImageID,
133+
Created: info.ContainerCreated,
134+
Metadata: info.ExtraAttributes(nil),
135135
},
136136
}
137137

138-
if ctx.Config[logCmdKey] == "true" {
139-
l.container.Command = ctx.Command()
138+
if info.Config[logCmdKey] == "true" {
139+
l.container.Command = info.Command()
140140
}
141141

142142
if onGCE {
@@ -145,11 +145,11 @@ func New(ctx logger.Context) (logger.Logger, error) {
145145
Name: instanceName,
146146
ID: instanceID,
147147
}
148-
} else if ctx.Config[logZoneKey] != "" || ctx.Config[logNameKey] != "" || ctx.Config[logIDKey] != "" {
148+
} else if info.Config[logZoneKey] != "" || info.Config[logNameKey] != "" || info.Config[logIDKey] != "" {
149149
l.instance = &instanceInfo{
150-
Zone: ctx.Config[logZoneKey],
151-
Name: ctx.Config[logNameKey],
152-
ID: ctx.Config[logIDKey],
150+
Zone: info.Config[logZoneKey],
151+
Name: info.Config[logNameKey],
152+
ID: info.Config[logIDKey],
153153
}
154154
}
155155

‎daemon/logger/gelf/gelf.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const name = "gelf"
2424

2525
type gelfLogger struct {
2626
writer *gelf.Writer
27-
ctx logger.Context
27+
info logger.Info
2828
hostname string
2929
rawExtra json.RawMessage
3030
}
@@ -40,36 +40,36 @@ func init() {
4040

4141
// New creates a gelf logger using the configuration passed in on the
4242
// context. The supported context configuration variable is gelf-address.
43-
func New(ctx logger.Context) (logger.Logger, error) {
43+
func New(info logger.Info) (logger.Logger, error) {
4444
// parse gelf address
45-
address, err := parseAddress(ctx.Config["gelf-address"])
45+
address, err := parseAddress(info.Config["gelf-address"])
4646
if err != nil {
4747
return nil, err
4848
}
4949

5050
// collect extra data for GELF message
51-
hostname, err := ctx.Hostname()
51+
hostname, err := info.Hostname()
5252
if err != nil {
5353
return nil, fmt.Errorf("gelf: cannot access hostname to set source field")
5454
}
5555

5656
// parse log tag
57-
tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
57+
tag, err := loggerutils.ParseLogTag(info, loggerutils.DefaultTemplate)
5858
if err != nil {
5959
return nil, err
6060
}
6161

6262
extra := map[string]interface{}{
63-
"_container_id": ctx.ContainerID,
64-
"_container_name": ctx.Name(),
65-
"_image_id": ctx.ContainerImageID,
66-
"_image_name": ctx.ContainerImageName,
67-
"_command": ctx.Command(),
63+
"_container_id": info.ContainerID,
64+
"_container_name": info.Name(),
65+
"_image_id": info.ContainerImageID,
66+
"_image_name": info.ContainerImageName,
67+
"_command": info.Command(),
6868
"_tag": tag,
69-
"_created": ctx.ContainerCreated,
69+
"_created": info.ContainerCreated,
7070
}
7171

72-
extraAttrs := ctx.ExtraAttributes(func(key string) string {
72+
extraAttrs := info.ExtraAttributes(func(key string) string {
7373
if key[0] == '_' {
7474
return key
7575
}
@@ -90,7 +90,7 @@ func New(ctx logger.Context) (logger.Logger, error) {
9090
return nil, fmt.Errorf("gelf: cannot connect to GELF endpoint: %s %v", address, err)
9191
}
9292

93-
if v, ok := ctx.Config["gelf-compression-type"]; ok {
93+
if v, ok := info.Config["gelf-compression-type"]; ok {
9494
switch v {
9595
case "gzip":
9696
gelfWriter.CompressionType = gelf.CompressGzip
@@ -103,7 +103,7 @@ func New(ctx logger.Context) (logger.Logger, error) {
103103
}
104104
}
105105

106-
if v, ok := ctx.Config["gelf-compression-level"]; ok {
106+
if v, ok := info.Config["gelf-compression-level"]; ok {
107107
val, err := strconv.Atoi(v)
108108
if err != nil {
109109
return nil, fmt.Errorf("gelf: invalid compression level %s, err %v", v, err)
@@ -113,7 +113,7 @@ func New(ctx logger.Context) (logger.Logger, error) {
113113

114114
return &gelfLogger{
115115
writer: gelfWriter,
116-
ctx: ctx,
116+
info: info,
117117
hostname: hostname,
118118
rawExtra: rawExtra,
119119
}, nil

0 commit comments

Comments
 (0)