Merge pull request moby#25736 from mwieczorek/25689-enable-syslog-driver-on-windows

cpuguy83 · web-flow · commit 2c91c5fdad49 · 2016-08-29T17:46:12.000-04:00
Enable syslog driver for windows
diff --git a/daemon/logdrivers_windows.go b/daemon/logdrivers_windows.go
@@ -7,4 +7,5 @@ import (
 	_ "github.com/docker/docker/daemon/logger/etwlogs"
 	_ "github.com/docker/docker/daemon/logger/jsonfilelog"
 	_ "github.com/docker/docker/daemon/logger/splunk"
+	_ "github.com/docker/docker/daemon/logger/syslog"
 )
diff --git a/daemon/logger/syslog/syslog.go b/daemon/logger/syslog/syslog.go
@@ -1,5 +1,3 @@
-// +build linux
-
 // Package syslog provides the logdriver for forwarding server logs to syslog endpoints.
 package syslog
 
diff --git a/daemon/logger/syslog/syslog_test.go b/daemon/logger/syslog/syslog_test.go
@@ -1,11 +1,10 @@
-// +build linux
-
 package syslog
 
 import (
-	syslog "github.com/RackSec/srslog"
 	"reflect"
 	"testing"
+
+	syslog "github.com/RackSec/srslog"
 )
 
 func functionMatches(expectedFun interface{}, actualFun interface{}) bool {
diff --git a/daemon/logger/syslog/syslog_unsupported.go b/daemon/logger/syslog/syslog_unsupported.go

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,5 @@ import (`
`7`	`7`	`_ "github.com/docker/docker/daemon/logger/etwlogs"`
`8`	`8`	`_ "github.com/docker/docker/daemon/logger/jsonfilelog"`
`9`	`9`	`_ "github.com/docker/docker/daemon/logger/splunk"`
	`10`	`+ _ "github.com/docker/docker/daemon/logger/syslog"`
`10`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build linux`
`2`		`-`
`3`	`1`	`// Package syslog provides the logdriver for forwarding server logs to syslog endpoints.`
`4`	`2`	`package syslog`
`5`	`3`