baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clean up some logging

Browse source
This commit is contained in:
Daniel Hiltgen 2024-02-15 09:56:49 -08:00
parent bb9de6037c
commit 5208cf09b1
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/lifecycle/updater_windows.go
View file

@ -48,7 +48,8 @@ func DoUpgrade(cancel context.CancelFunc, done chan int) error {
if done != nil { if done != nil {
<-done <-done
} else { } else {
slog.Warn("XXX done chan was nil, not actually waiting") // Shouldn't happen
slog.Warn("done chan was nil, not actually waiting")
} }
slog.Debug(fmt.Sprintf("starting installer: %s %v", installerExe, installArgs)) slog.Debug(fmt.Sprintf("starting installer: %s %v", installerExe, installArgs))

5
app/tray/wintray/eventloop.go
View file

@ -45,7 +45,6 @@ func nativeLoop() {
case 0: case 0:
return return
default: default:
// slog.Debug(fmt.Sprintf("XXX dispatching message from run loop 0x%x", m.Message))
pTranslateMessage.Call(uintptr(unsafe.Pointer(m))) //nolint:errcheck pTranslateMessage.Call(uintptr(unsafe.Pointer(m))) //nolint:errcheck
pDispatchMessage.Call(uintptr(unsafe.Pointer(m))) //nolint:errcheck pDispatchMessage.Call(uintptr(unsafe.Pointer(m))) //nolint:errcheck
@ -66,11 +65,9 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui
WM_MOUSEMOVE = 0x0200 WM_MOUSEMOVE = 0x0200
WM_LBUTTONDOWN = 0x0201 WM_LBUTTONDOWN = 0x0201
) )
// slog.Debug(fmt.Sprintf("XXX in wndProc: 0x%x", message))
switch message { switch message {
case WM_COMMAND: case WM_COMMAND:
menuItemId := int32(wParam) menuItemId := int32(wParam)
// slog.Debug(fmt.Sprintf("XXX Menu Click: %d", menuItemId))
// https://docs.microsoft.com/en-us/windows/win32/menurc/wm-command#menus // https://docs.microsoft.com/en-us/windows/win32/menurc/wm-command#menus
switch menuItemId { switch menuItemId {
case quitMenuID: case quitMenuID:
@ -151,7 +148,6 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui
slog.Debug(fmt.Sprintf("unmanaged app message, lParm: 0x%x", lParam)) slog.Debug(fmt.Sprintf("unmanaged app message, lParm: 0x%x", lParam))
} }
case t.wmTaskbarCreated: // on explorer.exe restarts case t.wmTaskbarCreated: // on explorer.exe restarts
slog.Debug("XXX got taskbar created event")
t.muNID.Lock() t.muNID.Lock()
err := t.nid.add() err := t.nid.add()
if err != nil { if err != nil {
@ -161,7 +157,6 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui
default: default:
// Calls the default window procedure to provide default processing for any window messages that an application does not process. // Calls the default window procedure to provide default processing for any window messages that an application does not process.
// https://msdn.microsoft.com/en-us/library/windows/desktop/ms633572(v=vs.85).aspx // https://msdn.microsoft.com/en-us/library/windows/desktop/ms633572(v=vs.85).aspx
// slog.Debug(fmt.Sprintf("XXX default wndProc handler 0x%x", message))
lResult, _, _ = pDefWindowProc.Call( lResult, _, _ = pDefWindowProc.Call(
uintptr(hWnd), uintptr(hWnd),
uintptr(message), uintptr(message),