From dbcf4058e503650fa15d6fcc50b2a7f0f3c14709 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Wed, 25 Aug 2021 20:30:31 +1000
Subject: [PATCH] [windows-x] Update log runtime

---
 v2/pkg/runtime/log.go     | 67 +++++++++++++++++++--------------------
 v2/pkg/runtime/runtime.go | 11 +++++++
 2 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/v2/pkg/runtime/log.go b/v2/pkg/runtime/log.go
index c3b4832af..5f46c61df 100644
--- a/v2/pkg/runtime/log.go
+++ b/v2/pkg/runtime/log.go
@@ -1,57 +1,54 @@
-// +build cgo
-
 package runtime
 
 import (
 	"context"
-	"github.com/wailsapp/wails/v2/internal/servicebus"
 	"github.com/wailsapp/wails/v2/pkg/logger"
 )
 
-// Print prints a Print level message
-func Print(ctx context.Context, message string) {
-	bus := servicebus.ExtractBus(ctx)
-	bus.Publish("log:print", message)
+// LogPrint prints a Print level message
+func LogPrint(ctx context.Context, message string) {
+	myLogger := getLogger(ctx)
+	myLogger.Print(message)
 }
 
-// Trace prints a Trace level message
-func Trace(ctx context.Context, message string) {
-	bus := servicebus.ExtractBus(ctx)
-	bus.Publish("log:trace", message)
+// LogTrace prints a Trace level message
+func LogTrace(ctx context.Context, message string) {
+	myLogger := getLogger(ctx)
+	myLogger.Trace(message)
 }
 
-// Debug prints a Debug level message
-func Debug(ctx context.Context, message string) {
-	bus := servicebus.ExtractBus(ctx)
-	bus.Publish("log:debug", message)
+// LogDebug prints a Debug level message
+func LogDebug(ctx context.Context, message string) {
+	myLogger := getLogger(ctx)
+	myLogger.Debug(message)
 }
 
-// Info prints a Info level message
-func Info(ctx context.Context, message string) {
-	bus := servicebus.ExtractBus(ctx)
-	bus.Publish("log:info", message)
+// LogInfo prints a Info level message
+func LogInfo(ctx context.Context, message string) {
+	myLogger := getLogger(ctx)
+	myLogger.Info(message)
 }
 
-// Warning prints a Warning level message
-func Warning(ctx context.Context, message string) {
-	bus := servicebus.ExtractBus(ctx)
-	bus.Publish("log:warning", message)
+// LogWarning prints a Warning level message
+func LogWarning(ctx context.Context, message string) {
+	myLogger := getLogger(ctx)
+	myLogger.Warning(message)
 }
 
-// Error prints a Error level message
-func Error(ctx context.Context, message string) {
-	bus := servicebus.ExtractBus(ctx)
-	bus.Publish("log:error", message)
+// LogError prints a Error level message
+func LogError(ctx context.Context, message string) {
+	myLogger := getLogger(ctx)
+	myLogger.Error(message)
 }
 
-// Fatal prints a Fatal level message
-func Fatal(ctx context.Context, message string) {
-	bus := servicebus.ExtractBus(ctx)
-	bus.Publish("log:fatal", message)
+// LogFatal prints a Fatal level message
+func LogFatal(ctx context.Context, message string) {
+	myLogger := getLogger(ctx)
+	myLogger.Fatal(message)
 }
 
-// SetLogLevel sets the log level
-func SetLogLevel(ctx context.Context, level logger.LogLevel) {
-	bus := servicebus.ExtractBus(ctx)
-	bus.Publish("log:setlevel", level)
+// LogSetLogLevel sets the log level
+func LogSetLogLevel(ctx context.Context, level logger.LogLevel) {
+	myLogger := getLogger(ctx)
+	myLogger.SetLogLevel(level)
 }
diff --git a/v2/pkg/runtime/runtime.go b/v2/pkg/runtime/runtime.go
index 2448c9f22..5baa2d030 100644
--- a/v2/pkg/runtime/runtime.go
+++ b/v2/pkg/runtime/runtime.go
@@ -3,6 +3,7 @@ package runtime
 import (
 	"context"
 	"github.com/wailsapp/wails/v2/internal/frontend"
+	"github.com/wailsapp/wails/v2/internal/logger"
 	"log"
 	goruntime "runtime"
 )
@@ -17,6 +18,16 @@ func getFrontend(ctx context.Context) frontend.Frontend {
 	log.Fatalf("cannot call '%s': Application not initialised", funcName)
 	return nil
 }
+func getLogger(ctx context.Context) *logger.Logger {
+	result := ctx.Value("logger")
+	if result != nil {
+		return result.(*logger.Logger)
+	}
+	pc, _, _, _ := goruntime.Caller(1)
+	funcName := goruntime.FuncForPC(pc).Name()
+	log.Fatalf("cannot call '%s': Application not initialised", funcName)
+	return nil
+}
 
 func getEvents(ctx context.Context) frontend.Events {
 	result := ctx.Value("events")