Skip to content

Commit

Permalink
test: add some debug logs for scanning
Browse files Browse the repository at this point in the history
  • Loading branch information
sentriz committed Jun 17, 2021
1 parent 802745d commit 0c407b2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 0 deletions.
4 changes: 4 additions & 0 deletions server/ctrladmin/handlers.go
Expand Up @@ -26,7 +26,9 @@ func firstExisting(or string, strings ...string) string {
}

func doScan(scanner *scanner.Scanner, opts scanner.ScanOptions) {
log.Printf("+++ admin scan b\n")
go func() {
log.Printf("+++ admin scan c\n")
if err := scanner.Start(opts); err != nil {
log.Printf("error while scanning: %v\n", err)
}
Expand Down Expand Up @@ -364,6 +366,7 @@ func (c *Controller) ServeUpdateLastFMAPIKeyDo(r *http.Request) *Response {
}

func (c *Controller) ServeStartScanIncDo(r *http.Request) *Response {
log.Printf("+++ admin scan a\n")
defer doScan(c.Scanner, scanner.ScanOptions{})
return &Response{
redirect: "/admin/home",
Expand All @@ -372,6 +375,7 @@ func (c *Controller) ServeStartScanIncDo(r *http.Request) *Response {
}

func (c *Controller) ServeStartScanFullDo(r *http.Request) *Response {
log.Printf("+++ admin full scan a\n")
defer doScan(c.Scanner, scanner.ScanOptions{IsFull: true})
return &Response{
redirect: "/admin/home",
Expand Down
2 changes: 2 additions & 0 deletions server/ctrlsubsonic/handlers_common.go
Expand Up @@ -76,7 +76,9 @@ func (c *Controller) ServeGetMusicFolders(r *http.Request) *spec.Response {
}

func (c *Controller) ServeStartScan(r *http.Request) *spec.Response {
log.Printf("+++ pre scanning from subsonic controller\n")
go func() {
log.Printf("+++ scanning from subsonic controller\n")
if err := c.Scanner.Start(scanner.ScanOptions{}); err != nil {
log.Printf("error while scanning: %v\n", err)
}
Expand Down
5 changes: 5 additions & 0 deletions server/scanner/scanner.go
Expand Up @@ -51,8 +51,10 @@ func IsScanning() bool {
}

func SetScanning() func() {
log.Printf("+++ atomic set scanning\n")
atomic.StoreInt32(&isScanning, 1)
return func() {
log.Printf("+++ atomic unset scanning\n")
atomic.StoreInt32(&isScanning, 0)
}
}
Expand Down Expand Up @@ -178,6 +180,7 @@ type ScanOptions struct {

func (s *Scanner) Start(opts ScanOptions) error {
if IsScanning() {
log.Printf("+++ not scanning\n")
return ErrAlreadyScanning
}
unSet := SetScanning()
Expand All @@ -189,6 +192,7 @@ func (s *Scanner) Start(opts ScanOptions) error {
s.curFolders = &stack.Stack{}
s.seenTracksNew = 0
// ** begin being walking
log.Printf("+++ starting normal scan\n")
log.Println("starting scan")
var errCount int
start := time.Now()
Expand Down Expand Up @@ -234,6 +238,7 @@ func (s *Scanner) Start(opts ScanOptions) error {
clean.name, durSince(start), deleted)
}
// finish up
log.Printf("+++ finished scanning\n")
strNow := strconv.FormatInt(time.Now().Unix(), 10)
s.db.SetSetting("last_scan_time", strNow)
return nil
Expand Down
2 changes: 2 additions & 0 deletions server/server.go
Expand Up @@ -269,8 +269,10 @@ func (s *Server) StartScanTicker(dur time.Duration) (FuncExecute, FuncInterrupt)
for {
select {
case <-done:
log.Printf("+++ tick done %v\n", dur)
return nil
case <-ticker.C:
log.Printf("+++ tick scanner %v\n", dur)
if err := s.scanner.Start(scanner.ScanOptions{}); err != nil {
log.Printf("error scanning: %v", err)
}
Expand Down

0 comments on commit 0c407b2

Please sign in to comment.