github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 23:51:44 +08:00
Code Projects Activity

[v2] Tidy up console output

Browse Source
This commit is contained in:
Lea Anthony 2021-09-25 11:34:54 +10:00
parent ad25c256f9
commit b5bc0ba181
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
v2/internal/frontend/assetserver/assetserver_desktop.go
View File

@ -37,7 +37,7 @@ func NewDesktopAssetServer(ctx context.Context, assets embed.FS, bindingsJSON st
if err != nil { if err != nil {
return nil, err return nil, err
} }
result.LogInfo("Loading assets from: %s", absdir) result.LogDebug("Loading assets from: %s", absdir)
} }
var buffer bytes.Buffer var buffer bytes.Buffer
@ -48,9 +48,9 @@ func NewDesktopAssetServer(ctx context.Context, assets embed.FS, bindingsJSON st
return result, err return result, err
} }
func (d *DesktopAssetServer) LogInfo(message string, args ...interface{}) { func (d *DesktopAssetServer) LogDebug(message string, args ...interface{}) {
if d.logger != nil { if d.logger != nil {
d.logger.Info("[DesktopAssetServer] "+message, args...) d.logger.Debug("[DesktopAssetServer] "+message, args...)
} }
} }

2
v2/internal/frontend/assetserver/assetserver_desktop_dev.go
View File

@ -8,6 +8,6 @@ import (
) )
func (a *DesktopAssetServer) ReadFile(filename string) ([]byte, error) { func (a *DesktopAssetServer) ReadFile(filename string) ([]byte, error) {
a.LogInfo("Loading file from disk: %s", filename) a.LogDebug("Loading file from disk: %s", filename)
return os.ReadFile(filepath.Join(a.assetdir, filename)) return os.ReadFile(filepath.Join(a.assetdir, filename))
} }

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

@ -69,12 +69,12 @@ func (d *DevWebServer) Run(ctx context.Context) error {
if mt, msg, err = c.ReadMessage(); err != nil { if mt, msg, err = c.ReadMessage(); err != nil {
break break
} }
// d.logger.Info("[%p] %s", c, msg) // We do not support drag in browsers
if string(msg) == "drag" { if string(msg) == "drag" {
continue continue
} }
// Notify the other browsers // Notify the other browsers of "EventEmit"
if len(msg) > 2 && strings.HasPrefix(string(msg), "EE") { if len(msg) > 2 && strings.HasPrefix(string(msg), "EE") {
d.notifyExcludingSender(msg, c) d.notifyExcludingSender(msg, c)
} }
@ -86,7 +86,6 @@ func (d *DevWebServer) Run(ctx context.Context) error {
} }
if result != "" { if result != "" {
if err = c.WriteMessage(mt, []byte(result)); err != nil { if err = c.WriteMessage(mt, []byte(result)); err != nil {
log.Println("write:", err)
break break
} }
} }
@ -112,7 +111,7 @@ func (d *DevWebServer) Run(ctx context.Context) error {
if err != nil { if err != nil {
return err return err
} }
d.LogInfo("Serving assets from: %s", absdir) d.LogDebug("Serving assets from: %s", absdir)
} }
d.server.Get("*", d.loadAsset) d.server.Get("*", d.loadAsset)
@ -123,14 +122,14 @@ func (d *DevWebServer) Run(ctx context.Context) error {
if err != nil { if err != nil {
log.Error(err.Error()) log.Error(err.Error())
} }
d.LogInfo("Shutdown completed") d.LogDebug("Shutdown completed")
}(d.server, d.logger) }(d.server, d.logger)
d.LogInfo("Serving application at http://localhost:34115") d.LogDebug("Serving application at http://localhost:34115")
// Launch desktop app // Launch desktop app
err := d.desktopFrontend.Run(ctx) err := d.desktopFrontend.Run(ctx)
d.LogInfo("Starting shutdown") d.LogDebug("Starting shutdown")
err2 := d.server.Shutdown() err2 := d.server.Shutdown()
if err2 != nil { if err2 != nil {
d.logger.Error(err.Error()) d.logger.Error(err.Error())
@ -273,8 +272,8 @@ func (d *DevWebServer) loadAsset(ctx *fiber.Ctx) error {
return nil return nil
} }
func (d *DevWebServer) LogInfo(message string, args ...interface{}) { func (d *DevWebServer) LogDebug(message string, args ...interface{}) {
d.logger.Info("[DevWebServer] "+message, args...) d.logger.Debug("[DevWebServer] "+message, args...)
} }
func (d *DevWebServer) newWebsocketSession(c *websocket.Conn) { func (d *DevWebServer) newWebsocketSession(c *websocket.Conn) {
@ -284,11 +283,11 @@ func (d *DevWebServer) newWebsocketSession(c *websocket.Conn) {
d.socketMutex.Lock() d.socketMutex.Lock()
defer d.socketMutex.Unlock() defer d.socketMutex.Unlock()
delete(d.websocketClients, c) delete(d.websocketClients, c)
d.LogInfo(fmt.Sprintf("Websocket client %p disconnected", c)) d.LogDebug(fmt.Sprintf("Websocket client %p disconnected", c))
return nil return nil
}) })
d.websocketClients[c] = struct{}{} d.websocketClients[c] = struct{}{}
d.LogInfo(fmt.Sprintf("Websocket client %p connected", c)) d.LogDebug(fmt.Sprintf("Websocket client %p connected", c))
} }
type EventNotify struct { type EventNotify struct {

1
v2/internal/frontend/runtime/events.go
View File

@ -146,6 +146,5 @@ func (e *Events) notifyBackend(eventName string, data ...interface{}) {
} }
func (e *Events) AddFrontend(appFrontend frontend.Frontend) { func (e *Events) AddFrontend(appFrontend frontend.Frontend) {
println("Adding frontend", appFrontend)
e.frontend = append(e.frontend, appFrontend) e.frontend = append(e.frontend, appFrontend)
} }