docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13306 from ahmetalpbalkan/logopts-context 

Pass --log-opts map to logdrivers
This commit is contained in:
Michael Crosby 2015-05-18 10:58:17 -07:00
parent 19ae59f910 8b11592d69
commit cbc122e8a7
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/container.go
View File

@ -1452,6 +1452,7 @@ func (container *Container) getLogger() (logger.Logger, error) {
return nil, fmt.Errorf("Failed to get logging factory: %v", err) return nil, fmt.Errorf("Failed to get logging factory: %v", err)
} }
ctx := logger.Context{ ctx := logger.Context{
Config: cfg.Config,
ContainerID: container.ID, ContainerID: container.ID,
ContainerName: container.Name, ContainerName: container.Name,
} }

1
daemon/logger/factory.go
View File

@ -10,6 +10,7 @@ type Creator func(Context) (Logger, error)
// Context provides enough information for a logging driver to do its function // Context provides enough information for a logging driver to do its function
type Context struct { type Context struct {
Config map[string]string
ContainerID string ContainerID string
ContainerName string ContainerName string
LogPath string LogPath string