Use actuator instead of ServerStatus

opentransportro · Apr 16, 2024 · ca6ce8c · ca6ce8c
1 parent 51269a1
commit ca6ce8c
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 217 deletions.
diff --git a/app/src/main/java/org/transitclock/api/data/ApiServerMonitor.java b/app/src/main/java/org/transitclock/api/data/ApiServerMonitor.java
diff --git a/app/src/main/java/org/transitclock/api/data/ApiServerStatus.java b/app/src/main/java/org/transitclock/api/data/ApiServerStatus.java
diff --git a/app/src/main/java/org/transitclock/api/resources/BaseApiResource.java b/app/src/main/java/org/transitclock/api/resources/BaseApiResource.java
@@ -23,9 +23,6 @@ public abstract class BaseApiResource {
     @Autowired
     protected PredictionAnalysisService predictionAnalysisService;
 
-    @Autowired
-    protected ServerStatusService serverStatusService;
-
     @Autowired
     protected VehiclesService vehiclesService;
 

diff --git a/app/src/main/java/org/transitclock/api/resources/TransitimeApi.java b/app/src/main/java/org/transitclock/api/resources/TransitimeApi.java
@@ -18,7 +18,6 @@
 import org.transitclock.api.data.ApiRoutesDetailsResponse;
 import org.transitclock.api.data.ApiSchedulesHorizStops;
 import org.transitclock.api.data.ApiSchedulesVertStopsResponse;
-import org.transitclock.api.data.ApiServerStatus;
 import org.transitclock.api.data.ApiTrip;
 import org.transitclock.api.data.ApiTripPatternsResponse;
 import org.transitclock.api.data.ApiTripWithTravelTimes;
@@ -864,24 +863,6 @@ ResponseEntity<ApiSchedulesHorizStops> getScheduleHorizStops(
             tags = {"base data", "serviceId"})
     ResponseEntity<ApiIdsResponse> getCurrentServiceIds(StandardParameters stdParameters);
 
-    /**
-     * Returns status about the specified agency server. Currently provides info on the DbLogger
-     * queue.
-     *
-     * @param stdParameters
-     *
-     * @return
-     *
-     * @
-     */
-    @GetMapping(value = "/command/serverStatus",
-            produces = {MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_XML_VALUE})
-    @Operation(
-            summary = "Retrives server status information.",
-            description = "Retrives server status information.",
-            tags = {"server status"})
-    ResponseEntity<ApiServerStatus> getServerStatus(StandardParameters stdParameters);
-
     @Operation(summary = "Returns exports list", description = "Returns exports list")
     @GetMapping(value = "/command/exports",
             produces = {MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_XML_VALUE})

diff --git a/app/src/main/java/org/transitclock/api/resources/TransitimeResource.java b/app/src/main/java/org/transitclock/api/resources/TransitimeResource.java
@@ -20,11 +20,10 @@
 import org.transitclock.api.data.ApiExportsDataResponse;
 import org.transitclock.api.data.ApiIdsResponse;
 import org.transitclock.api.data.ApiPredictionsResponse;
-import org.transitclock.api.data.ApiRoutesResponse;
 import org.transitclock.api.data.ApiRoutesDetailsResponse;
+import org.transitclock.api.data.ApiRoutesResponse;
 import org.transitclock.api.data.ApiSchedulesHorizStops;
 import org.transitclock.api.data.ApiSchedulesVertStopsResponse;
-import org.transitclock.api.data.ApiServerStatus;
 import org.transitclock.api.data.ApiTrip;
 import org.transitclock.api.data.ApiTripPatternsResponse;
 import org.transitclock.api.data.ApiTripWithTravelTimes;
@@ -51,7 +50,6 @@
 import org.transitclock.service.dto.IpcRoute;
 import org.transitclock.service.dto.IpcRouteSummary;
 import org.transitclock.service.dto.IpcSchedule;
-import org.transitclock.service.dto.IpcServerStatus;
 import org.transitclock.service.dto.IpcTrip;
 import org.transitclock.service.dto.IpcTripPattern;
 import org.transitclock.service.dto.IpcVehicle;
@@ -957,25 +955,6 @@ public ResponseEntity<ApiIdsResponse> getCurrentServiceIds(StandardParameters st
         }
     }
 
-    @Override
-    public ResponseEntity<ApiServerStatus> getServerStatus(StandardParameters stdParameters) {
-
-        // Make sure request is valid
-        validate(stdParameters);
-
-        try {
-            // Get status information from server
-            IpcServerStatus ipcServerStatus = serverStatusService.get();
-
-            // Create and return ApiServerStatus response
-            ApiServerStatus apiServerStatus = new ApiServerStatus(stdParameters.getAgencyId(), ipcServerStatus);
-            return stdParameters.createResponse(apiServerStatus);
-        } catch (Exception e) {
-            // If problem getting data then return a Bad Request
-            throw WebUtils.badRequestException(e);
-        }
-    }
-
     @Override
     public ResponseEntity<ApiExportsDataResponse> getExports(StandardParameters stdParameters) {
         validate(stdParameters);

diff --git a/libs/core/build.gradle.kts b/libs/core/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     api("com.beust:jcommander:1.82")
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-cache")
+    implementation("org.springframework.boot:spring-boot-starter-actuator")
 
     api("org.hibernate.orm:hibernate-core")
     implementation("com.zaxxer:HikariCP")

diff --git a/libs/core/src/main/java/org/transitclock/service/ServerStatusServiceImpl.java b/libs/core/src/main/java/org/transitclock/service/ServerStatusServiceImpl.java
diff --git a/libs/core/src/main/java/org/transitclock/service/contract/ServerStatusService.java b/libs/core/src/main/java/org/transitclock/service/contract/ServerStatusService.java
diff --git a/libs/core/src/main/java/org/transitclock/service/dto/IpcServerStatus.java b/libs/core/src/main/java/org/transitclock/service/dto/IpcServerStatus.java
diff --git a/libs/core/src/main/resources/config/application.yml b/libs/core/src/main/resources/config/application.yml
@@ -24,6 +24,15 @@ spring:
   main:
     lazy-initialization: false
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: always
+
 server:
   port: 8080