fix(responsehandler): Fix no helpers for internal server error specif…

…ic case template
oxyno-zeta · Jul 3, 2021 · 13cb88e · 13cb88e
1 parent a26e93f
commit 13cb88e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/pkg/s3-proxy/response-handler/error-handlers.go b/pkg/s3-proxy/response-handler/error-handlers.go
@@ -428,13 +428,21 @@ func (h *handler) InternalServerError(
 		// Check if target config and template exists
 		if tplCfgItem != nil {
 			// Load template content
-			tplContent, err2 = h.loadTemplateContent(
+			tpl, err3 := h.loadTemplateContent(
 				loadFileContent,
 				tplCfgItem,
 			)
+			// Concat
+			tplContent = tplContent + "\n" + tpl
+			// Save error
+			err2 = err3
 		} else {
 			// Get template from general configuration
-			tplContent, err2 = loadLocalFileContent(cfg.Templates.InternalServerError.Path)
+			tpl, err3 := loadLocalFileContent(cfg.Templates.InternalServerError.Path)
+			// Concat
+			tplContent = tplContent + "\n" + tpl
+			// Save error
+			err2 = err3
 		}
 	}