Skip to content

logging: honour --log-level across nfs, dbserver, and device #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vynulldev merged 4 commits into from
Jul 27, 2026
Merged

logging: honour --log-level across nfs, dbserver, and device #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
326e5d6
nfs: finish the dlog conversion so READ stops spamming at info
vynulldev Jul 27, 2026
d6e11cd
dbserver: finish the dlog conversion for browse and packet logging
vynulldev Jul 27, 2026
f57a6b7
device: gate the remaining wire dumps behind debug/trace
vynulldev Jul 27, 2026
65d1f49
device + api: log track names alongside IDs on the load path
vynulldev Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,8 +910,14 @@ func (s *Server) handleLoadTrack(w http.ResponseWriter, r *http.Request) {
return
}

// Send the load track command
err := s.Device.LoadTrackOnCDJ(req.TrackID, req.DeviceNumber, targetIP)
// Send the load track command. The name rides along for the logs.
loadName := ""
if s.Library != nil {
if t := s.Library.Track(req.TrackID); t != nil {
loadName = t.Title
}
}
err := s.Device.LoadTrackOnCDJ(req.TrackID, loadName, req.DeviceNumber, targetIP)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
Expand Down
46 changes: 23 additions & 23 deletions dbserver/categories.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package dbserver

import (
"fmt"
"log"
"github.com/vynulldev/vynull/internal/dlog"
"sort"
"strings"

Expand All @@ -27,7 +27,7 @@ func (h *Handler) handleGetTracks(msg *proto.DBMessage) []*proto.DBMessage {
h.pendingItems = h.tracksToStdItems(tracks)
}
sortItems(h.pendingItems, getSortOrder(msg))
log.Printf("dbserver: get tracks returning %d items (sort=%d)", len(h.pendingItems), getSortOrder(msg))
dlog.Debugf("dbserver: get tracks returning %d items (sort=%d)", len(h.pendingItems), getSortOrder(msg))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -54,7 +54,7 @@ func (h *Handler) handleGetArtists(msg *proto.DBMessage) []*proto.DBMessage {
}
}
sortItems(h.pendingItems, sortTitle) // artists always sorted by name
log.Printf("dbserver: get artists returning %d items", len(h.pendingItems))
dlog.Debugf("dbserver: get artists returning %d items", len(h.pendingItems))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -81,7 +81,7 @@ func (h *Handler) handleGetAlbums(msg *proto.DBMessage) []*proto.DBMessage {
}
}
sortItems(h.pendingItems, sortTitle) // albums always sorted by name
log.Printf("dbserver: get albums returning %d items", len(h.pendingItems))
dlog.Debugf("dbserver: get albums returning %d items", len(h.pendingItems))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -95,7 +95,7 @@ func (h *Handler) handleGetGenres(msg *proto.DBMessage) []*proto.DBMessage {
ItemType: 0x06, // genre
}
}
log.Printf("dbserver: get genres returning %d items", len(h.pendingItems))
dlog.Debugf("dbserver: get genres returning %d items", len(h.pendingItems))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -120,7 +120,7 @@ func (h *Handler) handleGetBPM(msg *proto.DBMessage) []*proto.DBMessage {
})
}
h.setPendingAll(msg, items)
log.Printf("dbserver: get BPM returning %d items", len(items))
dlog.Debugf("dbserver: get BPM returning %d items", len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand Down Expand Up @@ -164,7 +164,7 @@ func (h *Handler) handleGetBPMRanges(msg *proto.DBMessage) []*proto.DBMessage {
})
}
h.setPendingAll(msg, items)
log.Printf("dbserver: BPM ranges for %d returning 7 items", targetBPM/100)
dlog.Debugf("dbserver: BPM ranges for %d returning 7 items", targetBPM/100)
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -179,7 +179,7 @@ func (h *Handler) handleGetTracksByBPM(msg *proto.DBMessage) []*proto.DBMessage
tracks := h.tracksForBPMBucket(targetBPM100, pctRange)
items := h.tracksToStdItems(tracks)
h.setPendingAll(msg, items)
log.Printf("dbserver: tracks for BPM %.0f +/-%d%% returning %d items", float64(targetBPM100)/100.0, pctRange, len(items))
dlog.Debugf("dbserver: tracks for BPM %.0f +/-%d%% returning %d items", float64(targetBPM100)/100.0, pctRange, len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand Down Expand Up @@ -253,7 +253,7 @@ func (h *Handler) handleGetYearsForDecade(msg *proto.DBMessage) []*proto.DBMessa
}

h.setPendingAll(msg, items)
log.Printf("dbserver: years for decade %d returning %d items", decadeStart, len(items))
dlog.Debugf("dbserver: years for decade %d returning %d items", decadeStart, len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand Down Expand Up @@ -282,7 +282,7 @@ func (h *Handler) handleGetTracksByYear(msg *proto.DBMessage) []*proto.DBMessage
}
items := h.tracksToStdItems(tracks)
h.setPendingAll(msg, items)
log.Printf("dbserver: tracks for decade %d year 0x%08x returning %d items", decadeStart, yearID, len(items))
dlog.Debugf("dbserver: tracks for decade %d year 0x%08x returning %d items", decadeStart, yearID, len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -306,7 +306,7 @@ func (h *Handler) handleGetYears(msg *proto.DBMessage) []*proto.DBMessage {
}
sort.Slice(items, func(i, j int) bool { return items[i].ID > items[j].ID })
h.setPendingAll(msg, items)
log.Printf("dbserver: get decades returning %d items", len(items))
dlog.Debugf("dbserver: get decades returning %d items", len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}
func (h *Handler) handleGetRating(msg *proto.DBMessage) []*proto.DBMessage {
Expand All @@ -320,7 +320,7 @@ func (h *Handler) handleGetRating(msg *proto.DBMessage) []*proto.DBMessage {
{ID: 5, Label1: "5", ItemType: 0x0a},
}
h.setPendingAll(msg, items)
log.Printf("dbserver: RATING list returning %d items", len(items))
dlog.Debugf("dbserver: RATING list returning %d items", len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -339,7 +339,7 @@ func (h *Handler) handleGetTracksByRating(msg *proto.DBMessage) []*proto.DBMessa
}
items := h.tracksToStdItems(matches)
h.setPendingAll(msg, items)
log.Printf("dbserver: RATING drill rating=%d returning %d tracks", rating, len(items))
dlog.Debugf("dbserver: RATING drill rating=%d returning %d tracks", rating, len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand Down Expand Up @@ -367,7 +367,7 @@ func (h *Handler) handleGetTime(msg *proto.DBMessage) []*proto.DBMessage {
}
sort.Slice(items, func(i, j int) bool { return items[i].ID < items[j].ID })
h.setPendingAll(msg, items)
log.Printf("dbserver: TIME list returning %d items", len(items))
dlog.Debugf("dbserver: TIME list returning %d items", len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -388,7 +388,7 @@ func (h *Handler) handleGetTracksByTime(msg *proto.DBMessage) []*proto.DBMessage
}
items := h.tracksToStdItems(matches)
h.setPendingAll(msg, items)
log.Printf("dbserver: TIME drill minute=%d returning %d tracks", bucket, len(items))
dlog.Debugf("dbserver: TIME drill minute=%d returning %d tracks", bucket, len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -409,7 +409,7 @@ func (h *Handler) handleGetTracksByBitrate(msg *proto.DBMessage) []*proto.DBMess
}
items := h.tracksToStdItems(matches)
h.setPendingAll(msg, items)
log.Printf("dbserver: BITRATE drill kbps=%d returning %d tracks", bitrate, len(items))
dlog.Debugf("dbserver: BITRATE drill kbps=%d returning %d tracks", bitrate, len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -434,7 +434,7 @@ func (h *Handler) handleGetBitrate(msg *proto.DBMessage) []*proto.DBMessage {
}
sort.Slice(items, func(i, j int) bool { return items[i].ID < items[j].ID })
h.setPendingAll(msg, items)
log.Printf("dbserver: BITRATE list returning %d items", len(items))
dlog.Debugf("dbserver: BITRATE list returning %d items", len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -461,7 +461,7 @@ func (h *Handler) handleGetFilename(msg *proto.DBMessage) []*proto.DBMessage {
}
sort.Slice(items, func(i, j int) bool { return items[i].Label1 < items[j].Label1 })
h.setPendingAll(msg, items)
log.Printf("dbserver: FILENAME list returning %d items", len(items))
dlog.Debugf("dbserver: FILENAME list returning %d items", len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -470,7 +470,7 @@ func (h *Handler) handleGetFilename(msg *proto.DBMessage) []*proto.DBMessage {
// entry (single empty row).
func (h *Handler) handleGetHotCueBank(msg *proto.DBMessage) []*proto.DBMessage {
h.setPendingAll(msg, nil)
log.Printf("dbserver: HOT CUE BANK list (empty — not stored)")
dlog.Debugf("dbserver: HOT CUE BANK list (empty — not stored)")
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand Down Expand Up @@ -506,7 +506,7 @@ func (h *Handler) handleGetKeys(msg *proto.DBMessage) []*proto.DBMessage {
h.pendingItems = nil
}
sortItems(h.pendingItems, sortTitle)
log.Printf("dbserver: get keys returning %d items", len(h.pendingItems))
dlog.Debugf("dbserver: get keys returning %d items", len(h.pendingItems))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -527,7 +527,7 @@ func (h *Handler) handleGetLabels(msg *proto.DBMessage) []*proto.DBMessage {
}
h.pendingItems = items
sortItems(h.pendingItems, sortTitle)
log.Printf("dbserver: get labels returning %d items", len(h.pendingItems))
dlog.Debugf("dbserver: get labels returning %d items", len(h.pendingItems))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -549,7 +549,7 @@ func (h *Handler) handleGetRemixers(msg *proto.DBMessage) []*proto.DBMessage {
}
sortItems(items, sortTitle)
h.setPendingAll(msg, items)
log.Printf("dbserver: get remixers returning %d items", len(items))
dlog.Debugf("dbserver: get remixers returning %d items", len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}

Expand All @@ -571,6 +571,6 @@ func (h *Handler) handleGetOriginalArtists(msg *proto.DBMessage) []*proto.DBMess
}
sortItems(items, sortTitle)
h.setPendingAll(msg, items)
log.Printf("dbserver: get original artists returning %d items", len(items))
dlog.Debugf("dbserver: get original artists returning %d items", len(items))
return []*proto.DBMessage{h.successWithCount(msg)}
}
7 changes: 4 additions & 3 deletions dbserver/cuepoints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"encoding/binary"
"encoding/json"
"fmt"
"github.com/vynulldev/vynull/internal/dlog"
"log"
"os"
"path/filepath"
Expand Down Expand Up @@ -62,7 +63,7 @@ func ParseCueBlob(blob []byte, trackID uint32) (*CuePoint, error) {
}
cue.ColorID = cueColorFromBlob(blob)

log.Printf("cuestore: parsed cue #%d type=%d time=%dms loop=%d color_id=%d (0x%x) track=%d",
dlog.Debugf("cuestore: parsed cue #%d type=%d time=%dms loop=%d color_id=%d (0x%x) track=%d",
cue.Number, cue.Type, cue.TimeMs, cue.LoopMs, cue.ColorID, cue.ColorID, trackID)
return cue, nil
}
Expand Down Expand Up @@ -338,11 +339,11 @@ func (cs *CueStore) loadAll() {
}
var cues []CuePoint
if err := json.Unmarshal(data, &cues); err != nil {
log.Printf("cuestore: parse %s: %v", e.Name(), err)
dlog.Debugf("cuestore: parse %s: %v", e.Name(), err)
continue
}
cs.data[trackID] = cues
log.Printf("cuestore: loaded %d cues for track %d", len(cues), trackID)
dlog.Debugf("cuestore: loaded %d cues for track %d", len(cues), trackID)
}
// Load raw blob files.
var bTrackID uint32
Expand Down
Loading
Loading