GitList

Browse code

Pass -log-opts map to logdrivers

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>

Ahmet Alp Balkan authored on 2015/05/19 01:50:14
Showing 2 changed files

daemon/container.go index 8212ad2..8bd229f 100644
daemon/logger/factory.go index 9a37dde..80234ee 100644

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

daemon/logger/factory.go

History View file @ 8b11592

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

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