luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Server: Improve initialization and logging of extensions

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2022-09-02 19:09:25 +02:00
parent 41fdba3cf7
commit 86086753c2
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
internal/server/routes.go
View file

@ -3,6 +3,7 @@ package server
import (
"net/http"
"path/filepath"
"time"
"github.com/gin-gonic/gin"
@ -16,9 +17,16 @@ func registerRoutes(router *gin.Engine, conf *config.Config) {
// handler for the path with (without) the trailing slash exists.
router.RedirectTrailingSlash = true
// Static favicon image.
router.StaticFile(conf.BaseUri("/favicon.ico"), filepath.Join(conf.ImgPath(), "favicon.ico"))
// Static assets like js, css and font files.
router.Static(conf.BaseUri(config.StaticUri), conf.StaticPath())
router.StaticFile(conf.BaseUri("/favicon.ico"), filepath.Join(conf.ImgPath(), "favicon.ico"))
// Serve custom static assets if dir exists.
if dir := conf.CustomStaticPath(); dir != "" {
router.Static(conf.BaseUri(config.CustomStaticUri), dir)
}
// PWA Manifest.
router.GET(conf.BaseUri("/manifest.json"), func(c *gin.Context) {
@ -197,10 +205,12 @@ func registerRoutes(router *gin.Engine, conf *config.Config) {
// Initialize package extensions.
for _, ext := range Extensions() {
start := time.Now()
if err := ext.init(router, conf); err != nil {
log.Warnf("server: failed to initialize extension %s (%s)", clean.Log(ext.name), err)
log.Warnf("server: %s in %s extension[%s]", err, clean.Log(ext.name), time.Since(start))
} else {
log.Debugf("server: extension %s initialized", clean.Log(ext.name))
log.Debugf("server: %s extension loaded [%s]", clean.Log(ext.name), time.Since(start))
}
}

4
internal/server/server.go
View file

@ -81,11 +81,9 @@ func Start(ctx context.Context, conf *config.Config) {
Handler: router,
}
log.Debugf("server: successfully initialized [%s]", time.Since(start))
// Start HTTP server.
go func() {
log.Infof("server: listening at %s", server.Addr)
log.Infof("server: listening on %s [%s]", server.Addr, time.Since(start))
if err := server.ListenAndServe(); err != nil {
if err == http.ErrServerClosed {