템플릿 엔진 상태 점검 추가 - Thymeleaf 구성 검증 로직 반영
eapim-portal CI / build (push) Has been cancelled
eapim-portal Test / test (push) Has been cancelled

This commit is contained in:
Rinjae
2026-08-27 16:44:57 +09:00
parent 21940a3e18
commit 2d0ff2bf84
@@ -10,14 +10,21 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.thymeleaf.spring5.SpringTemplateEngine;
/** /**
* Readiness probe. * Readiness probe.
* *
* <p>Distinct from {@link HealthCheckController} (liveness — servlet alive?). * <p>Distinct from {@link HealthCheckController} (liveness — servlet alive?).
* This endpoint validates both EMS and Gateway datasources via JDBC * This endpoint validates both EMS and Gateway datasources via JDBC
* {@code Connection.isValid(timeout)} to confirm the app is ready to serve * {@code Connection.isValid(timeout)}, and the Thymeleaf {@link SpringTemplateEngine}
* requests that depend on the database. * configuration, to confirm the app is ready to serve real page requests.
*
* <p>The template-engine check exists because this controller bypasses view
* resolution entirely (plain {@code @RestController} JSON) — a broken
* {@code TemplateEngine.getConfiguration()} (e.g. classpath split causing
* {@link java.util.ServiceConfigurationError} during dialect/module discovery)
* previously left every real page returning 500 while this probe still reported 200.
* *
* <p>HTTP 200 + JSON when all checks pass. * <p>HTTP 200 + JSON when all checks pass.
* <p>HTTP 503 + JSON when any check fails — body still includes the per-component * <p>HTTP 503 + JSON when any check fails — body still includes the per-component
@@ -30,24 +37,29 @@ public class ReadinessController {
private final DataSource portalDataSource; private final DataSource portalDataSource;
private final DataSource gatewayDataSource; private final DataSource gatewayDataSource;
private final SpringTemplateEngine templateEngine;
public ReadinessController( public ReadinessController(
@Qualifier("portalDataSource") DataSource portalDataSource, @Qualifier("portalDataSource") DataSource portalDataSource,
@Qualifier("gatewayDataSource") DataSource gatewayDataSource) { @Qualifier("gatewayDataSource") DataSource gatewayDataSource,
SpringTemplateEngine templateEngine) {
this.portalDataSource = portalDataSource; this.portalDataSource = portalDataSource;
this.gatewayDataSource = gatewayDataSource; this.gatewayDataSource = gatewayDataSource;
this.templateEngine = templateEngine;
} }
@GetMapping(value = "/health/ready", produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "/health/ready", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<String> ready() { public ResponseEntity<String> ready() {
String ems = check(portalDataSource); String ems = check(portalDataSource);
String gw = check(gatewayDataSource); String gw = check(gatewayDataSource);
boolean ok = "UP".equals(ems) && "UP".equals(gw); String view = checkTemplateEngine();
boolean ok = "UP".equals(ems) && "UP".equals(gw) && "UP".equals(view);
String body = "{" String body = "{"
+ "\"status\":\"" + (ok ? "UP" : "DOWN") + "\"," + "\"status\":\"" + (ok ? "UP" : "DOWN") + "\","
+ "\"ems\":\"" + ems + "\"," + "\"ems\":\"" + ems + "\","
+ "\"gateway\":\""+ gw + "\"" + "\"gateway\":\"" + gw + "\","
+ "\"view\":\"" + view + "\""
+ "}"; + "}";
return ResponseEntity.status(ok ? 200 : 503) return ResponseEntity.status(ok ? 200 : 503)
@@ -55,6 +67,20 @@ public class ReadinessController {
.body(body); .body(body);
} }
/** {@code getConfiguration()} lazily runs Thymeleaf's dialect/module init on first call
* and caches it — so this is cheap once healthy, and reproduces the exact failure path
* a real page render would hit. Catches {@link Throwable}: init failures here have
* surfaced as {@link Error} (ServiceConfigurationError), not just Exception. */
private String checkTemplateEngine() {
try {
templateEngine.getConfiguration();
return "UP";
} catch (Throwable t) {
String msg = t.getMessage() == null ? t.getClass().getSimpleName() : t.getMessage();
return "DOWN:" + msg.replace('"', '\'').replace('\n', ' ').replace('\r', ' ');
}
}
private static String check(DataSource ds) { private static String check(DataSource ds) {
if (ds == null) return "DOWN:NO_DATASOURCE"; if (ds == null) return "DOWN:NO_DATASOURCE";
try (Connection c = ds.getConnection()) { try (Connection c = ds.getConnection()) {