Skip to content

Commit

Permalink
don't deliver "image" resource in monitoring endpoint.
Browse files Browse the repository at this point in the history
This provokes an error and serves no discernible purpose
  • Loading branch information
Florian Alpers committed Jan 29, 2025
1 parent eed5f5d commit 1e56ce8
Showing 1 changed file with 9 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@
import java.util.HashMap;
import java.util.Map;

import jakarta.inject.Inject;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand All @@ -48,13 +38,20 @@
import io.goobi.viewer.api.rest.v1.ApiUrls;
import io.goobi.viewer.controller.DataManager;
import io.goobi.viewer.controller.JsonTools;
import io.goobi.viewer.controller.NetTools;
import io.goobi.viewer.controller.mq.MessageQueueManager;
import io.goobi.viewer.exceptions.DAOException;
import io.goobi.viewer.exceptions.HTTPException;
import io.goobi.viewer.modules.IModule;
import io.goobi.viewer.solr.SolrTools;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.inject.Inject;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;

@Path(ApiUrls.MONITORING)
public class MonitoringResource {
Expand Down Expand Up @@ -103,15 +100,6 @@ public MonitoringStatus checkServices() {
logger.warn("DB monitoring check failed.");
}

// Check image delivery
try {
NetTools.getWebContentGET(
DataManager.getInstance().getConfiguration().getRestApiUrl() + "records/-/files/footer/-/full/100,/0/default.jpg");
} catch (HTTPException | IOException e) {
ret.getMonitoring().put(MonitoringStatus.KEY_IMAGES, MonitoringStatus.STATUS_ERROR);
logger.warn("Image delivery monitoring check failed.");
}

// Check message queue status
if (messageBroker != null) {
if (DataManager.getInstance().getConfiguration().isStartInternalMessageBroker()) {
Expand Down

0 comments on commit 1e56ce8

Please sign in to comment.