From 86086753c2f28adc6eae68cea43cadaf005c0ea9 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@photoprism.app>
Date: Fri, 2 Sep 2022 19:09:25 +0200
Subject: [PATCH] Server: Improve initialization and logging of extensions

Signed-off-by: Michael Mayer <michael@photoprism.app>
---
 internal/server/routes.go | 16 +++++++++++++---
 internal/server/server.go |  4 +---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/internal/server/routes.go b/internal/server/routes.go
index 9f2f6eda3..ecea7bb42 100644
--- a/internal/server/routes.go
+++ b/internal/server/routes.go
@@ -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))
 		}
 	}
 
diff --git a/internal/server/server.go b/internal/server/server.go
index 71ae72e4d..36e3d0058 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -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 {