From 71f299976447a641bacf029a3866fb4bc12a7686 Mon Sep 17 00:00:00 2001 From: Vladimir Pouzanov Date: Wed, 13 Jul 2016 13:56:18 +0100 Subject: [PATCH] Added optional flags to init gcp logger metadata Signed-off-by: Vladimir Pouzanov --- daemon/logger/gcplogs/gcplogging.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/daemon/logger/gcplogs/gcplogging.go b/daemon/logger/gcplogs/gcplogging.go index 781642bb50..9a8c1c903f 100644 --- a/daemon/logger/gcplogs/gcplogging.go +++ b/daemon/logger/gcplogs/gcplogging.go @@ -21,6 +21,9 @@ const ( logLabelsKey = "labels" logEnvKey = "env" logCmdKey = "gcp-log-cmd" + logZoneKey = "gcp-meta-zone" + logNameKey = "gcp-meta-name" + logIDKey = "gcp-meta-id" ) var ( @@ -142,6 +145,12 @@ func New(ctx logger.Context) (logger.Logger, error) { Name: instanceName, ID: instanceID, } + } else if ctx.Config[logZoneKey] != "" || ctx.Config[logNameKey] != "" || ctx.Config[logIDKey] != "" { + l.instance = &instanceInfo{ + Zone: ctx.Config[logZoneKey], + Name: ctx.Config[logNameKey], + ID: ctx.Config[logIDKey], + } } // The logger "overflows" at a rate of 10,000 logs per second and this @@ -163,7 +172,7 @@ func New(ctx logger.Context) (logger.Logger, error) { func ValidateLogOpts(cfg map[string]string) error { for k := range cfg { switch k { - case projectOptKey, logLabelsKey, logEnvKey, logCmdKey: + case projectOptKey, logLabelsKey, logEnvKey, logCmdKey, logZoneKey, logNameKey, logIDKey: default: return fmt.Errorf("%q is not a valid option for the gcplogs driver", k) }