johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backend: Adjust log levels and messages

Browse Source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer
2020-07-18 13:21:43 +02:00
parent 9c1518c5ef
commit 28ff51d5cf
9 changed files with 101 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/import.go
View File

@@ -87,7 +87,7 @@ func StartImport(router *gin.RouterGroup) {
moments := service.Moments() moments := service.Moments()
if err := moments.Start(); err != nil { if err := moments.Start(); err != nil {
log.Error(err) log.Warnf("moments: %s", err)
} }
elapsed := int(time.Since(start).Seconds()) elapsed := int(time.Since(start).Seconds())

2
internal/api/index.go
View File

@@ -76,7 +76,7 @@ func StartIndexing(router *gin.RouterGroup) {
moments := service.Moments() moments := service.Moments()
if err := moments.Start(); err != nil { if err := moments.Start(); err != nil {
log.Error(err) log.Warnf("moments: %s", err)
} }
elapsed := int(time.Since(start).Seconds()) elapsed := int(time.Since(start).Seconds())

104
internal/form/photo_search.go
View File

@@ -6,58 +6,58 @@ import (
// PhotoSearch represents search form fields for "/api/v1/photos". // PhotoSearch represents search form fields for "/api/v1/photos".
type PhotoSearch struct { type PhotoSearch struct {
Query string `form:"q"` Query string `form:"q"`
Filter string `form:"filter"` Filter string `form:"filter"`
ID string `form:"id"` ID string `form:"id"`
Type string `form:"type"` Type string `form:"type"`
Path string `form:"path"` Path string `form:"path"`
Folder string `form:"folder"` // Alias for Path Folder string `form:"folder"` // Alias for Path
Name string `form:"name"` Name string `form:"name"`
Original string `form:"original"` Original string `form:"original"`
Title string `form:"title"` Title string `form:"title"`
Hash string `form:"hash"` Hash string `form:"hash"`
Primary bool `form:"primary"` Primary bool `form:"primary"`
Video bool `form:"video"` Video bool `form:"video"`
Photo bool `form:"photo"` Photo bool `form:"photo"`
Scan bool `form:"scan"` Scan bool `form:"scan"`
Panorama bool `form:"panorama"` Panorama bool `form:"panorama"`
Error bool `form:"error"` Error bool `form:"error"`
Hidden bool `form:"hidden"` Hidden bool `form:"hidden"`
Archived bool `form:"archived"` Archived bool `form:"archived"`
Public bool `form:"public"` Public bool `form:"public"`
Private bool `form:"private"` Private bool `form:"private"`
Favorite bool `form:"favorite"` Favorite bool `form:"favorite"`
Unsorted bool `form:"unsorted"` Unsorted bool `form:"unsorted"`
Stack bool `form:"stack"` Stack bool `form:"stack"`
Lat float32 `form:"lat"` Lat float32 `form:"lat"`
Lng float32 `form:"lng"` Lng float32 `form:"lng"`
Dist uint `form:"dist"` Dist uint `form:"dist"`
Fmin float32 `form:"fmin"` Fmin float32 `form:"fmin"`
Fmax float32 `form:"fmax"` Fmax float32 `form:"fmax"`
Chroma uint8 `form:"chroma"` Chroma uint8 `form:"chroma"`
Diff uint32 `form:"diff"` Diff uint32 `form:"diff"`
Mono bool `form:"mono"` Mono bool `form:"mono"`
Portrait bool `form:"portrait"` Portrait bool `form:"portrait"`
Geo bool `form:"geo"` Geo bool `form:"geo"`
Album string `form:"album"` Album string `form:"album"`
Label string `form:"label"` Label string `form:"label"`
Category string `form:"category"` // Moments Category string `form:"category"` // Moments
Country string `form:"country"` // Moments Country string `form:"country"` // Moments
State string `form:"state"` // Moments State string `form:"state"` // Moments
Year int `form:"year"` // Moments Year int `form:"year"` // Moments
Month int `form:"month"` // Moments Month int `form:"month"` // Moments
Day int `form:"day"` // Moments Day int `form:"day"` // Moments
Color string `form:"color"` Color string `form:"color"`
Quality int `form:"quality"` Quality int `form:"quality"`
Review bool `form:"review"` Review bool `form:"review"`
Camera int `form:"camera"` Camera int `form:"camera"`
Lens int `form:"lens"` Lens int `form:"lens"`
Before time.Time `form:"before" time_format:"2006-01-02"` Before time.Time `form:"before" time_format:"2006-01-02"`
After time.Time `form:"after" time_format:"2006-01-02"` After time.Time `form:"after" time_format:"2006-01-02"`
Count int `form:"count" binding:"required" serialize:"-"` Count int `form:"count" binding:"required" serialize:"-"`
Offset int `form:"offset" serialize:"-"` Offset int `form:"offset" serialize:"-"`
Order string `form:"order" serialize:"-"` Order string `form:"order" serialize:"-"`
Merged bool `form:"merged" serialize:"-"` Merged bool `form:"merged" serialize:"-"`
} }
func (f *PhotoSearch) GetQuery() string { func (f *PhotoSearch) GetQuery() string {

84
internal/form/serialize_test.go
View File

@@ -8,48 +8,48 @@ import (
) )
type TestForm struct { type TestForm struct {
Query string `form:"q"` Query string `form:"q"`
ID string `form:"id"` ID string `form:"id"`
Type string `form:"type"` Type string `form:"type"`
Path string `form:"path"` Path string `form:"path"`
Folder string `form:"folder"` Folder string `form:"folder"`
Name string `form:"name"` Name string `form:"name"`
Title string `form:"title"` Title string `form:"title"`
Hash string `form:"hash"` Hash string `form:"hash"`
Video bool `form:"video"` Video bool `form:"video"`
Photo bool `form:"photo"` Photo bool `form:"photo"`
Archived bool `form:"archived"` Archived bool `form:"archived"`
Error bool `form:"error"` Error bool `form:"error"`
Lat float32 `form:"lat"` Lat float32 `form:"lat"`
Lng float32 `form:"lng"` Lng float32 `form:"lng"`
Dist uint `form:"dist"` Dist uint `form:"dist"`
Fmin float32 `form:"fmin"` Fmin float32 `form:"fmin"`
Fmax float32 `form:"fmax"` Fmax float32 `form:"fmax"`
Chroma uint8 `form:"chroma"` Chroma uint8 `form:"chroma"`
Diff uint32 `form:"diff"` Diff uint32 `form:"diff"`
Mono bool `form:"mono"` Mono bool `form:"mono"`
Portrait bool `form:"portrait"` Portrait bool `form:"portrait"`
Location bool `form:"location"` Location bool `form:"location"`
Album string `form:"album"` Album string `form:"album"`
Label string `form:"label"` Label string `form:"label"`
Country string `form:"country"` Country string `form:"country"`
Year int `form:"year"` Year int `form:"year"`
Month int `form:"month"` Month int `form:"month"`
Color string `form:"color"` Color string `form:"color"`
Quality int `form:"quality"` Quality int `form:"quality"`
Review bool `form:"review"` Review bool `form:"review"`
Camera int `form:"camera"` Camera int `form:"camera"`
Lens int `form:"lens"` Lens int `form:"lens"`
Before time.Time `form:"before" time_format:"2006-01-02"` Before time.Time `form:"before" time_format:"2006-01-02"`
After time.Time `form:"after" time_format:"2006-01-02"` After time.Time `form:"after" time_format:"2006-01-02"`
Favorite bool `form:"favorite"` Favorite bool `form:"favorite"`
Public bool `form:"public"` Public bool `form:"public"`
Private bool `form:"private"` Private bool `form:"private"`
Safe bool `form:"safe"` Safe bool `form:"safe"`
Count int `form:"count" binding:"required" serialize:"-"` Count int `form:"count" binding:"required" serialize:"-"`
Offset int `form:"offset" serialize:"-"` Offset int `form:"offset" serialize:"-"`
Order string `form:"order" serialize:"-"` Order string `form:"order" serialize:"-"`
Merged bool `form:"merged" serialize:"-"` Merged bool `form:"merged" serialize:"-"`
} }
func TestSerialize(t *testing.T) { func TestSerialize(t *testing.T) {

3
internal/photoprism/moments.go
View File

@@ -38,7 +38,6 @@ func (m *Moments) Start() (err error) {
}() }()
if err := mutex.MainWorker.Start(); err != nil { if err := mutex.MainWorker.Start(); err != nil {
log.Warnf("moments: %s (start)", err.Error())
return err return err
} }
@@ -207,7 +206,7 @@ func (m *Moments) Start() (err error) {
if err := a.Update("AlbumFilter", f.Serialize()); err != nil { if err := a.Update("AlbumFilter", f.Serialize()); err != nil {
log.Errorf("moments: %s", err.Error()) log.Errorf("moments: %s", err.Error())
} else { } else {
log.Infof("moments: updated %s (%s)", txt.Quote(a.AlbumTitle), f.Serialize()) log.Debugf("moments: updated %s (%s)", txt.Quote(a.AlbumTitle), f.Serialize())
} }
} else if a := entity.NewMomentsAlbum(mom.Title(), mom.Slug(), f.Serialize()); a != nil { } else if a := entity.NewMomentsAlbum(mom.Title(), mom.Slug(), f.Serialize()); a != nil {
if err := a.Create(); err != nil { if err := a.Create(); err != nil {

3
internal/workers/meta.go
View File

@@ -39,7 +39,6 @@ func (worker *Meta) Start() (err error) {
}() }()
if err := mutex.MetaWorker.Start(); err != nil { if err := mutex.MetaWorker.Start(); err != nil {
log.Warnf("meta-worker: %s (start)", err.Error())
return err return err
} }
@@ -109,7 +108,7 @@ func (worker *Meta) Start() (err error) {
moments := photoprism.NewMoments(worker.conf) moments := photoprism.NewMoments(worker.conf)
if err := moments.Start(); err != nil { if err := moments.Start(); err != nil {
log.Error(err) log.Warnf("moments: %s", err)
} }
runtime.GC() runtime.GC()

1
internal/workers/share.go
View File

@@ -43,7 +43,6 @@ func (worker *Share) Start() (err error) {
}() }()
if err := mutex.ShareWorker.Start(); err != nil { if err := mutex.ShareWorker.Start(); err != nil {
log.Warnf("share-worker: %s (start)", err.Error())
return err return err
} }

1
internal/workers/sync.go
View File

@@ -50,7 +50,6 @@ func (worker *Sync) Start() (err error) {
}() }()
if err := mutex.SyncWorker.Start(); err != nil { if err := mutex.SyncWorker.Start(); err != nil {
log.Warnf("sync-worker: %s (start)", err.Error())
return err return err
} }

6
internal/workers/workers.go
View File

@@ -45,7 +45,7 @@ func StartMeta(conf *config.Config) {
go func() { go func() {
worker := NewMeta(conf) worker := NewMeta(conf)
if err := worker.Start(); err != nil { if err := worker.Start(); err != nil {
log.Error(err) log.Warnf("meta-worker: %s", err)
} }
}() }()
} }
@@ -57,7 +57,7 @@ func StartShare(conf *config.Config) {
go func() { go func() {
worker := NewShare(conf) worker := NewShare(conf)
if err := worker.Start(); err != nil { if err := worker.Start(); err != nil {
log.Error(err) log.Warnf("share-worker: %s", err)
} }
}() }()
} }
@@ -69,7 +69,7 @@ func StartSync(conf *config.Config) {
go func() { go func() {
worker := NewSync(conf) worker := NewSync(conf)
if err := worker.Start(); err != nil { if err := worker.Start(); err != nil {
log.Error(err) log.Warnf("sync-worker: %s", err)
} }
}() }()
} }