From 8c38fbe97b39d9b6bc0a09135adef282dad0a0f3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 27 Jan 2021 00:33:36 +0100 Subject: tunnel: update to simpler logging interface Signed-off-by: Jason A. Donenfeld --- tunnel/service.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tunnel/service.go') diff --git a/tunnel/service.go b/tunnel/service.go index cb577358..48bbdeb3 100644 --- a/tunnel/service.go +++ b/tunnel/service.go @@ -131,8 +131,7 @@ func (service *tunnelService) Execute(args []string, r <-chan svc.ChangeRequest, return } - logPrefix := fmt.Sprintf("[%s] ", config.Name) - log.SetPrefix(logPrefix) + log.SetPrefix(fmt.Sprintf("[%s] ", config.Name)) log.Println("Starting", version.UserAgent()) @@ -197,9 +196,7 @@ func (service *tunnelService) Execute(args []string, r <-chan svc.ChangeRequest, } log.Println("Creating interface instance") - logOutput := log.New(ringlogger.Global, logPrefix, 0) - logger := &device.Logger{logOutput, logOutput, logOutput} - dev = device.NewDevice(wintun, logger) + dev = device.NewDevice(wintun, &device.Logger{log.Printf, log.Printf}) log.Println("Setting interface configuration") uapi, err = ipc.UAPIListen(config.Name) -- cgit v1.2.3-59-g8ed1b