github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 03:40:12 +08:00
Code Projects Activity

[dev] Fix panic in devserver when using the logger (#2481)

Browse Source
This commit is contained in:
stffabi 2023-03-13 08:12:09 +01:00 committed by GitHub
parent 4cd873fecb
commit 5dba18c853
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
v2/internal/frontend/devserver/devserver.go
View File

@ -62,9 +62,13 @@ func (d *DevWebServer) Run(ctx context.Context) error {
return err return err
} }
var myLogger assetserver.Logger
if _logger := ctx.Value("logger"); _logger != nil {
myLogger = _logger.(*logger.Logger)
}
var assetHandler http.Handler var assetHandler http.Handler
var wsHandler http.Handler var wsHandler http.Handler
var myLogger *logger.Logger
_fronendDevServerURL, _ := ctx.Value("frontenddevserverurl").(string) _fronendDevServerURL, _ := ctx.Value("frontenddevserverurl").(string)
if _fronendDevServerURL == "" { if _fronendDevServerURL == "" {
@ -73,9 +77,6 @@ func (d *DevWebServer) Run(ctx context.Context) error {
return c.String(http.StatusOK, assetdir) return c.String(http.StatusOK, assetdir)
}) })
if _logger := ctx.Value("logger"); _logger != nil {
myLogger = _logger.(*logger.Logger)
}
var err error var err error
assetHandler, err = assetserver.NewAssetHandler(assetServerConfig, myLogger) assetHandler, err = assetserver.NewAssetHandler(assetServerConfig, myLogger)
if err != nil { if err != nil {

3
website/src/pages/changelog.mdx
View File

@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Fixed
- Fixed panic when using `wails dev` and the AssetServer tried to log to the logger. Fixed by @stffabi in [PR](https://github.com/wailsapp/wails/pull/2481)
## v2.4.0 - 2022-03-08 ## v2.4.0 - 2022-03-08
### Added ### Added