Fix dockerfile

.dockerignore

@@ -3,3 +3,4 @@ xtemplate*
 caddy
 Dockerfile
 .dockerignore
+.gitignore

Dockerfile

@@ -22,4 +22,6 @@ COPY --from=build /build/xtemplate /app/xtemplate
 VOLUME /app/data
 EXPOSE 80
 
-ENTRYPOINT ["/app/xtemplate", '-template-root', '/app/templates', '-log', '0']
+ENTRYPOINT ["/app/xtemplate"]
+
+CMD ["-template-root", "/app/templates", "-watch-template", "false", "-log", "0"]

serve.go

@@ -41,7 +41,7 @@ func (server *xtemplate) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	log := server.log.With(slog.Group("serving",
+	log := server.log.With(slog.Group("serve",
 		slog.String("requestid", getRequestId(r.Context())),
 		slog.String("method", r.Method),
 		slog.String("path", r.URL.Path),
@@ -219,7 +219,8 @@ var serveFileHandler http.Handler = http.HandlerFunc(func(w http.ResponseWriter,
 	}
 
 	// if the request provides a hash, check that it matches. if not, we don't have that file
-	if queryhash := r.URL.Query().Get("hash"); queryhash != "" && queryhash != fileinfo.hash {
+	queryhash := r.URL.Query().Get("hash")
+	if queryhash != "" && queryhash != fileinfo.hash {
 		log.Debug("request for file with wrong hash query parameter", slog.String("expected", fileinfo.hash), slog.String("queryhash", queryhash))
 		http.NotFound(w, r)
 		return
@@ -260,7 +261,7 @@ var serveFileHandler http.Handler = http.HandlerFunc(func(w http.ResponseWriter,
 	w.Header().Add("Content-Encoding", encoding.encoding)
 	w.Header().Add("Vary", "Accept-Encoding")
 	// w.Header().Add("Access-Control-Allow-Origin", "*") // ???
-	if r.URL.Query().Get("hash") != "" {
+	if queryhash != "" {
 		// cache aggressively if the request is disambiguated by a valid hash
 		// should be `public` ???
 		w.Header().Set("Cache-Control", "public, max-age=31536000")

templates.go

@@ -60,6 +60,7 @@ var instanceIdentity int64
 func (configs *config) Build() (CancelHandler, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 
+	// start with default xtemplate struct
 	x := &xtemplate{
 		templateFS: os.DirFS("templates"),
 		ldelim:     "{{",
@@ -74,6 +75,7 @@ func (configs *config) Build() (CancelHandler, error) {
 		id:         atomic.AddInt64(&instanceIdentity, 1),
 	}
 
+	// apply all configs, which are funcs that mutate the xtemplate struct
 	for _, c := range *configs {
 		c(x)
 	}
@@ -121,6 +123,8 @@ func (configs *config) Build() (CancelHandler, error) {
 			}
 		}
 	}
+
+	log.Debug("xtemplate instance initialized", slog.Any("xtemplate", x))
 	return x, nil
 }