From 88def542330703866a1ad5994a13f9a593be63b0 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 28 Feb 2019 17:51:39 +0100
Subject: tunnel: log the builtin go log to elog

---
 service/service_manager.go | 3 ++-
 service/service_tunnel.go  | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'service')

diff --git a/service/service_manager.go b/service/service_manager.go
index c049465d..1f31521b 100644
--- a/service/service_manager.go
+++ b/service/service_manager.go
@@ -8,6 +8,7 @@ package service
 import (
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/debug"
 	"golang.org/x/sys/windows/svc/eventlog"
 	"golang.zx2c4.com/wireguard/windows/conf"
 	"log"
@@ -82,7 +83,7 @@ func localWellKnownSid(sidType wellKnownSidType) (*windows.SID, error) {
 type managerService struct{}
 
 type elogger struct {
-	*eventlog.Log
+	debug.Log
 }
 
 func (elog elogger) Write(p []byte) (n int, err error) {
diff --git a/service/service_tunnel.go b/service/service_tunnel.go
index b1f1df60..37e0de4c 100644
--- a/service/service_tunnel.go
+++ b/service/service_tunnel.go
@@ -30,10 +30,8 @@ func (elog confElogger) Write(p []byte) (n int, err error) {
 	msg := elog.conf.Name + ": " + string(p)
 	n = len(msg)
 	switch elog.level {
-	case 1:
+	case 1, 2:
 		err = elog.elog.Info(1, msg)
-	case 2:
-		err = elog.elog.Warning(1, msg)
 	case 3:
 		err = elog.elog.Error(1, msg)
 	}
@@ -62,6 +60,7 @@ func (service *tunnelService) Execute(args []string, r <-chan svc.ChangeRequest,
 			return
 		}
 	}
+	log.SetOutput(elogger{elog})
 
 	conf, err := conf.LoadFromPath(service.path)
 	if err != nil {
-- 
cgit v1.2.3-59-g8ed1b