device: combine debug and info log levels into 'verbose'

There are very few cases, if any, in which a user only wants one of
these levels, so combine it into a single level.

While we're at it, reduce indirection on the loggers by using an empty
function rather than a nil function pointer. It's not like we have
retpolines anyway, and we were always calling through a function with a
branch prior, so this seems like a net gain.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2021-01-26 23:05:48 +01:00
parent 7139279cd0
commit d669c78c43
13 changed files with 109 additions and 133 deletions

View File

@@ -31,11 +31,10 @@ func main() {
fmt.Fprintln(os.Stderr, "Warning: this is a test program for Windows, mainly used for debugging this Go package. For a real WireGuard for Windows client, the repo you want is <https://git.zx2c4.com/wireguard-windows/>, which includes this code as a module.")
logger := device.NewLogger(
device.LogLevelDebug,
device.LogLevelVerbose,
fmt.Sprintf("(%s) ", interfaceName),
)
logger.Infof("Starting wireguard-go version %v", device.WireGuardGoVersion)
logger.Debugf("Debug log enabled")
logger.Verbosef("Starting wireguard-go version %s", device.WireGuardGoVersion)
tun, err := tun.CreateTUN(interfaceName, 0)
if err == nil {
@@ -50,7 +49,7 @@ func main() {
device := device.NewDevice(tun, logger)
device.Up()
logger.Infof("Device started")
logger.Verbosef("Device started")
uapi, err := ipc.UAPIListen(interfaceName)
if err != nil {
@@ -71,7 +70,7 @@ func main() {
go device.IpcHandle(conn)
}
}()
logger.Infof("UAPI listener started")
logger.Verbosef("UAPI listener started")
// wait for program to terminate
@@ -90,5 +89,5 @@ func main() {
uapi.Close()
device.Close()
logger.Infof("Shutting down")
logger.Verbosef("Shutting down")
}