Skip to content

HealthCheckServlet: set content-type, close jsonb #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

HealthCheckServlet: set content-type, close jsonb #158

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45ca8ff
set Content-Type header to application/json in /health responses
derekm Nov 18, 2019
8a63191
Fix for health check memory leak caused by not closing Jsonb object
adamldoyle Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions util-health/src/main/java/ws/ament/hammock/health/HealthCheckServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.MediaType;

import java.io.IOException;

@WebServlet(urlPatterns = {"${health.servlet.uri}"}, name = "HealthServlet")
Expand All @@ -39,13 +41,21 @@ public class HealthCheckServlet extends HttpServlet {

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
Jsonb jsonb = JsonbBuilder.newBuilder().build();
resp.setContentType(MediaType.APPLICATION_JSON);
HealthCheckModel healthCheckModel = healthCheckManager.performHealthChecks();
if (healthCheckModel.getOutcome().equalsIgnoreCase(HealthCheckResponse.State.UP.name())) {
resp.setStatus(200);
} else {
resp.setStatus(503);
}
jsonb.toJson(healthCheckModel, resp.getOutputStream());
try (Jsonb jsonb = JsonbBuilder.newBuilder().build()) {
jsonb.toJson(healthCheckModel, resp.getOutputStream());
} catch (IOException ex) {
// Re-throw IOException specifically to maintain existing functionality
throw ex;
} catch (Exception ex) {
// Convert other exceptions thrown by close() into a runtime exception
throw new RuntimeException(ex);
}
}
}