From 87b585c354e04c15644708edfeabd41780a129ca Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Thu, 4 Jul 2024 13:44:13 +0300 Subject: [PATCH] RED-9489 - Implement graceful shutdown --- search-service-v1/search-service-server-v1/build.gradle.kts | 1 + .../com/iqser/red/service/search/v1/server/Application.java | 5 ++++- .../src/main/resources/application.yml | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/search-service-v1/search-service-server-v1/build.gradle.kts b/search-service-v1/search-service-server-v1/build.gradle.kts index 6743d71..0694109 100644 --- a/search-service-v1/search-service-server-v1/build.gradle.kts +++ b/search-service-v1/search-service-server-v1/build.gradle.kts @@ -24,6 +24,7 @@ val springBootStarterVersion = "3.1.5" dependencies { api("com.knecon.fforesight:tenant-commons:0.21.0") api("com.knecon.fforesight:tracing-commons:0.5.0") + api("com.knecon.fforesight:lifecycle-commons:0.6.0") api("com.google.guava:guava:31.1-jre") api("com.iqser.red.commons:storage-commons:2.45.0") api(project(":search-service-api-v1")) diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java index 34f5292..51c8be0 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java @@ -8,22 +8,25 @@ import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfi import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; import com.iqser.red.service.search.v1.server.client.FileStatusClient; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; import com.iqser.red.service.search.v1.server.settings.SearchServiceSettings; import com.iqser.red.storage.commons.StorageAutoConfiguration; +import com.knecon.fforesight.lifecyclecommons.LifecycleAutoconfiguration; import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration; import io.micrometer.core.aop.TimedAspect; import io.micrometer.core.instrument.MeterRegistry; -@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class}) +@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class, LifecycleAutoconfiguration.class}) @Import({StorageAutoConfiguration.class}) @EnableFeignClients(basePackageClasses = FileStatusClient.class) @EnableConfigurationProperties({ElasticsearchSettings.class, SearchServiceSettings.class}) @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class}) +@EnableAspectJAutoProxy public class Application { public static void main(String[] args) { diff --git a/search-service-v1/search-service-server-v1/src/main/resources/application.yml b/search-service-v1/search-service-server-v1/src/main/resources/application.yml index 8a17d77..cd057fa 100644 --- a/search-service-v1/search-service-server-v1/src/main/resources/application.yml +++ b/search-service-v1/search-service-server-v1/src/main/resources/application.yml @@ -18,6 +18,9 @@ project.version: 1.0-SNAPSHOT server: port: 8080 +lifecycle: + base-package: com.iqser.red.service.search + spring: application: name: search-service