From 154e2ac38e9513857c6707eaa6431a40c9167454 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Wed, 25 Apr 2018 13:52:53 -0700
Subject: [PATCH] embed: do not import journald dependencies on windows

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 embed/config.go           |  2 +-
 embed/journald_unix.go    | 28 ++++++++++++++++++++++++++++
 embed/journald_windows.go | 27 +++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 embed/journald_unix.go
 create mode 100644 embed/journald_windows.go

diff --git a/embed/config.go b/embed/config.go
index 73659e3aa60..9061b153c19 100644
--- a/embed/config.go
+++ b/embed/config.go
@@ -582,7 +582,7 @@ func (cfg *Config) setupLogging() error {
 			}
 		} else {
 			// use stderr as fallback
-			syncer := zapcore.AddSync(logutil.NewJournaldWriter(os.Stderr))
+			syncer := getZapWriteSyncer()
 			lvl := zap.NewAtomicLevelAt(zap.InfoLevel)
 			if cfg.Debug {
 				lvl = zap.NewAtomicLevelAt(zap.DebugLevel)
diff --git a/embed/journald_unix.go b/embed/journald_unix.go
new file mode 100644
index 00000000000..8944b4c4a5a
--- /dev/null
+++ b/embed/journald_unix.go
@@ -0,0 +1,28 @@
+// Copyright 2018 The etcd Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !windows
+
+package embed
+
+import (
+	"os"
+
+	"github.com/coreos/etcd/pkg/logutil"
+	"go.uber.org/zap/zapcore"
+)
+
+func getZapWriteSyncer() zapcore.WriteSyncer {
+	return zapcore.AddSync(logutil.NewJournaldWriter(os.Stderr))
+}
diff --git a/embed/journald_windows.go b/embed/journald_windows.go
new file mode 100644
index 00000000000..4ee146d35c8
--- /dev/null
+++ b/embed/journald_windows.go
@@ -0,0 +1,27 @@
+// Copyright 2018 The etcd Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build windows
+
+package embed
+
+import (
+	"os"
+
+	"go.uber.org/zap/zapcore"
+)
+
+func getZapWriteSyncer() zapcore.WriteSyncer {
+	return zapcore.AddSync(os.Stderr)
+}