From 171f8f4ade5ff3b73423c11eca3e85eade44fff6 Mon Sep 17 00:00:00 2001 From: George Cushen Date: Tue, 23 Sep 2025 00:28:52 +0100 Subject: [PATCH] fix: logger --- .../layouts/_partials/functions/logger.html | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/modules/blox-tailwind/layouts/_partials/functions/logger.html b/modules/blox-tailwind/layouts/_partials/functions/logger.html index 98c23ea8..ddf16084 100644 --- a/modules/blox-tailwind/layouts/_partials/functions/logger.html +++ b/modules/blox-tailwind/layouts/_partials/functions/logger.html @@ -5,7 +5,7 @@ - adapter: optional bool to force adapter-safe mode (e.g., from _content.gotmpl) */}} {{- $level := lower (.level | default "warn") -}} -{{- $msg := .message | default "" -}} +{{- $msg := (.message | default "" | string) -}} {{- $page := .page | default . -}} {{- $forceAdapter := .adapter | default false -}} {{- $isDev := or hugo.IsServer (eq hugo.Environment "development") -}} @@ -35,17 +35,31 @@ {{- end -}} +{{/* Ensure message is safely converted to string */}} +{{- $safeMsg := "" -}} +{{- if $msg -}} + {{- $safeMsg = ($msg | string | replaceRE "%" "%%" | replaceRE "\n" " " | replaceRE "\t" " ") -}} +{{- end -}} + {{- if eq $level "error" -}} {{- if not $isAdapter -}} - {{- errorf "%s" $msg -}} + {{- if $safeMsg -}} + {{- errorf $safeMsg -}} + {{- else -}} + {{- errorf "HBX: Empty error message" -}} + {{- end -}} {{- else -}} - {{- if $isDev -}}{{- end -}} + {{- if $isDev -}}{{- end -}} {{- end -}} {{- else -}} {{- if not $isAdapter -}} - {{- warnf "%s" $msg -}} + {{- if $safeMsg -}} + {{- warnf $safeMsg -}} + {{- else -}} + {{- warnf "HBX: Empty warning message" -}} + {{- end -}} {{- else -}} - {{- if $isDev -}}{{- end -}} + {{- if $isDev -}}{{- end -}} {{- end -}} {{- end -}} {{- "" -}}