From 8b11592d699df669b529e34658ef2d870c8a75f8 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Mon, 18 May 2015 16:50:14 +0000 Subject: [PATCH] Pass -log-opts map to logdrivers Signed-off-by: Ahmet Alp Balkan --- daemon/container.go | 1 + daemon/logger/factory.go | 1 + 2 files changed, 2 insertions(+) diff --git a/daemon/container.go b/daemon/container.go index 8212ad2391..8bd229f340 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -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, } diff --git a/daemon/logger/factory.go b/daemon/logger/factory.go index 9a37dde135..80234ee4a1 100644 --- a/daemon/logger/factory.go +++ b/daemon/logger/factory.go @@ -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