From 5c357f012d9ced420c17d108c50cc3db9bb01596 Mon Sep 17 00:00:00 2001 From: "Lea\\Anthony" Date: Wed, 22 Dec 2021 06:28:47 +1100 Subject: [PATCH] [v2] Update context error --- v2/pkg/runtime/runtime.go | 9 ++++++--- website/docs/reference/runtime/intro.mdx | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/v2/pkg/runtime/runtime.go b/v2/pkg/runtime/runtime.go index 9dbdffb8e..b10dc436d 100644 --- a/v2/pkg/runtime/runtime.go +++ b/v2/pkg/runtime/runtime.go @@ -8,6 +8,9 @@ import ( goruntime "runtime" ) +const contextError = `An invalid context was passed. This method requires the specific context given in the lifecycle hooks: +https://wails.io/docs/reference/runtime/intro` + func getFrontend(ctx context.Context) frontend.Frontend { if ctx == nil { pc, _, _, _ := goruntime.Caller(1) @@ -20,7 +23,7 @@ func getFrontend(ctx context.Context) frontend.Frontend { } pc, _, _, _ := goruntime.Caller(1) funcName := goruntime.FuncForPC(pc).Name() - log.Fatalf("cannot call '%s': Application not initialised", funcName) + log.Fatalf("cannot call '%s': %s", funcName, contextError) return nil } func getLogger(ctx context.Context) *logger.Logger { @@ -35,7 +38,7 @@ func getLogger(ctx context.Context) *logger.Logger { } pc, _, _, _ := goruntime.Caller(1) funcName := goruntime.FuncForPC(pc).Name() - log.Fatalf("cannot call '%s': Application not initialised", funcName) + log.Fatalf("cannot call '%s': %s", funcName, contextError) return nil } @@ -51,7 +54,7 @@ func getEvents(ctx context.Context) frontend.Events { } pc, _, _, _ := goruntime.Caller(1) funcName := goruntime.FuncForPC(pc).Name() - log.Fatalf("cannot call '%s': Application not initialised", funcName) + log.Fatalf("cannot call '%s': %s", funcName, contextError) return nil } diff --git a/website/docs/reference/runtime/intro.mdx b/website/docs/reference/runtime/intro.mdx index 4c0a6bfe4..acf77a678 100644 --- a/website/docs/reference/runtime/intro.mdx +++ b/website/docs/reference/runtime/intro.mdx @@ -8,7 +8,7 @@ The runtime is a library that provides utility methods for your application. The and the aim is to try and keep them at parity where possible. The Go Runtime is available through importing `github.com/wailsapp/wails/v2/pkg/runtime`. All methods in this package -take a context as the first parameter. This context can be obtained from the [OnStartup](/docs/reference/options#onstartup) +take a context as the first parameter. This context should be obtained from the [OnStartup](/docs/reference/options#onstartup) or [OnDomReady](/docs/reference/options#ondomready) hooks. :::info Note