Merge pull request moby#13223 from Microsoft/10662-loggers

Windows: Factor out syslog and journald
xye1989 · May 14, 2015 · a459246 · a459246
2 parents b2ad931 + 655a58e
commit a459246
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 0 deletions.
diff --git a/daemon/logdrivers.go → daemon/logdrivers_linux.go b/daemon/logdrivers.go → daemon/logdrivers_linux.go
diff --git a/daemon/logdrivers_windows.go 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
@@ -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
@@ -0,0 +1,3 @@
+// +build !linux
+
+package journald
diff --git 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
@@ -0,0 +1,3 @@
+// +build !linux
+
+package syslog