From 61fbecc287ad13d20876a0e9e0c79d6aa87253dd Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Thu, 4 Jul 2024 14:15:59 +0300 Subject: [PATCH] RED-9496 - Implement graceful shutdown --- .../layoutparser-service-server/build.gradle.kts | 1 + .../fforesight/service/layoutparser/server/Application.java | 5 ++++- .../src/main/resources/application.yml | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/layoutparser-service/layoutparser-service-server/build.gradle.kts b/layoutparser-service/layoutparser-service-server/build.gradle.kts index cc20ea7..36144a6 100644 --- a/layoutparser-service/layoutparser-service-server/build.gradle.kts +++ b/layoutparser-service/layoutparser-service-server/build.gradle.kts @@ -31,6 +31,7 @@ dependencies { implementation("com.iqser.red.commons:storage-commons:2.45.0") implementation("com.knecon.fforesight:tenant-commons:0.21.0") + implementation("com.knecon.fforesight:lifecycle-commons:0.6.0") implementation("com.knecon.fforesight:tracing-commons:0.5.0") implementation("org.springframework.boot:spring-boot-starter-actuator:${springBootStarterVersion}") implementation("org.springframework.boot:spring-boot-starter-amqp:${springBootStarterVersion}") diff --git a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/Application.java b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/Application.java index 6f9113a..ca0d446 100644 --- a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/Application.java +++ b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/Application.java @@ -6,10 +6,12 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; import com.amazonaws.services.s3.model.metrics.MetricsConfiguration; import com.iqser.red.storage.commons.StorageAutoConfiguration; +import com.knecon.fforesight.lifecyclecommons.LifecycleAutoconfiguration; import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingServiceProcessorConfiguration; import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration; @@ -17,8 +19,9 @@ import io.micrometer.observation.ObservationRegistry; import io.micrometer.observation.aop.ObservedAspect; @ImportAutoConfiguration({MultiTenancyAutoConfiguration.class}) -@Import({MetricsConfiguration.class, StorageAutoConfiguration.class, LayoutParsingServiceProcessorConfiguration.class}) +@Import({MetricsConfiguration.class, StorageAutoConfiguration.class, LayoutParsingServiceProcessorConfiguration.class, LifecycleAutoconfiguration.class}) @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class}) +@EnableAspectJAutoProxy public class Application { public static void main(String[] args) { diff --git a/layoutparser-service/layoutparser-service-server/src/main/resources/application.yml b/layoutparser-service/layoutparser-service-server/src/main/resources/application.yml index deaab33..dbe5146 100644 --- a/layoutparser-service/layoutparser-service-server/src/main/resources/application.yml +++ b/layoutparser-service/layoutparser-service-server/src/main/resources/application.yml @@ -15,6 +15,9 @@ project.version: 1.0-SNAPSHOT server: port: 8080 +lifecycle: + base-package: com.knecon.fforesight.service.layoutparser + spring: application: name: layoutparser-service