From d069c92fec9971e261dc5e79e0a2ec3f8582f038 Mon Sep 17 00:00:00 2001 From: Mike Estes Date: Tue, 3 Oct 2017 12:42:54 -0700 Subject: [PATCH] Add gelf log driver plugin to Windows build Signed-off-by: Mike Estes Upstream-commit: 10b449b997373df37f285594a624545ad3e173b2 Component: engine --- components/engine/daemon/logdrivers_windows.go | 1 + components/engine/daemon/logger/gelf/gelf.go | 2 -- components/engine/daemon/logger/gelf/gelf_unsupported.go | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 components/engine/daemon/logger/gelf/gelf_unsupported.go diff --git a/components/engine/daemon/logdrivers_windows.go b/components/engine/daemon/logdrivers_windows.go index f3002b97e2..9f99c618c6 100644 --- a/components/engine/daemon/logdrivers_windows.go +++ b/components/engine/daemon/logdrivers_windows.go @@ -6,6 +6,7 @@ import ( _ "github.com/docker/docker/daemon/logger/awslogs" _ "github.com/docker/docker/daemon/logger/etwlogs" _ "github.com/docker/docker/daemon/logger/fluentd" + _ "github.com/docker/docker/daemon/logger/gelf" _ "github.com/docker/docker/daemon/logger/jsonfilelog" _ "github.com/docker/docker/daemon/logger/logentries" _ "github.com/docker/docker/daemon/logger/splunk" diff --git a/components/engine/daemon/logger/gelf/gelf.go b/components/engine/daemon/logger/gelf/gelf.go index de209ce9bf..90b563c211 100644 --- a/components/engine/daemon/logger/gelf/gelf.go +++ b/components/engine/daemon/logger/gelf/gelf.go @@ -1,5 +1,3 @@ -// +build linux - // Package gelf provides the log driver for forwarding server logs to // endpoints that support the Graylog Extended Log Format. package gelf diff --git a/components/engine/daemon/logger/gelf/gelf_unsupported.go b/components/engine/daemon/logger/gelf/gelf_unsupported.go deleted file mode 100644 index 266f73b18b..0000000000 --- a/components/engine/daemon/logger/gelf/gelf_unsupported.go +++ /dev/null @@ -1,3 +0,0 @@ -// +build !linux - -package gelf