From 655a58e27bfcfd2494bb5d46f95cb49d655ad17a Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 14 May 2015 10:20:00 -0700 Subject: [PATCH] Windows: Factor out syslog and journald Signed-off-by: John Howard --- daemon/{logdrivers.go => logdrivers_linux.go} | 0 daemon/logdrivers_windows.go | 7 +++++++ daemon/logger/journald/journald.go | 2 ++ daemon/logger/journald/journald_unsupported.go | 3 +++ daemon/logger/syslog/syslog.go | 2 ++ daemon/logger/syslog/syslog_unsupported.go | 3 +++ 6 files changed, 17 insertions(+) rename daemon/{logdrivers.go => logdrivers_linux.go} (100%) create mode 100644 daemon/logdrivers_windows.go create mode 100644 daemon/logger/journald/journald_unsupported.go create mode 100644 daemon/logger/syslog/syslog_unsupported.go diff --git a/daemon/logdrivers.go b/daemon/logdrivers_linux.go similarity index 100% rename from daemon/logdrivers.go rename to daemon/logdrivers_linux.go diff --git a/daemon/logdrivers_windows.go b/daemon/logdrivers_windows.go new file mode 100644 index 0000000000..5dcbe718c6 --- /dev/null +++ b/daemon/logdrivers_windows.go @@ -0,0 +1,7 @@ +package daemon + +// Importing packages here only to make sure their init gets called and +// therefore they register themselves to the logdriver factory. +import ( + _ "github.com/docker/docker/daemon/logger/jsonfilelog" +) diff --git a/daemon/logger/journald/journald.go b/daemon/logger/journald/journald.go index 5dd0fe1951..7aa28f0d08 100644 --- a/daemon/logger/journald/journald.go +++ b/daemon/logger/journald/journald.go @@ -1,3 +1,5 @@ +// +build linux + package journald import ( diff --git a/daemon/logger/journald/journald_unsupported.go b/daemon/logger/journald/journald_unsupported.go new file mode 100644 index 0000000000..110833c23b --- /dev/null +++ b/daemon/logger/journald/journald_unsupported.go @@ -0,0 +1,3 @@ +// +build !linux + +package journald diff --git a/daemon/logger/syslog/syslog.go b/daemon/logger/syslog/syslog.go index ca38d37f7f..6a6377f833 100644 --- a/daemon/logger/syslog/syslog.go +++ b/daemon/logger/syslog/syslog.go @@ -1,3 +1,5 @@ +// +build linux + package syslog import ( diff --git a/daemon/logger/syslog/syslog_unsupported.go b/daemon/logger/syslog/syslog_unsupported.go new file mode 100644 index 0000000000..50cc51b657 --- /dev/null +++ b/daemon/logger/syslog/syslog_unsupported.go @@ -0,0 +1,3 @@ +// +build !linux + +package syslog