X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fquery%2FQueryApplicationConfiguration.java;h=b546b8c5183e59b9cee5e533f12d7e518937c5bd;hb=9f2fda277bdd947461dc5b6dd350c29944fb43c3;hp=ae93d457a61b4b23cca64e61bc09d7d52cd84c4c;hpb=fd0085bfd05d92d9619f480b9bc25a4b7f3065f9;p=demos%2Fkafka%2Fwordcount

diff --git a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
index ae93d45..b546b8c 100644
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
@@ -1,10 +1,12 @@
 package de.juplo.kafka.wordcount.query;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.serialization.Serdes;
 import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.state.HostInfo;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -15,10 +17,14 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.Properties;
+import java.util.concurrent.CompletableFuture;
+
+import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
 
 
 @Configuration
 @EnableConfigurationProperties(QueryApplicationProperties.class)
+@Slf4j
 public class QueryApplicationConfiguration
 {
 	@Bean
@@ -51,20 +57,30 @@ public class QueryApplicationConfiguration
 	{
 		Properties props = new Properties();
 
+		props.putAll(serializationConfig());
+
 		String applicationId = applicationProperties.getApplicationId();
 		String bootstrapServer = applicationProperties.getBootstrapServer();
 
 		props.put(StreamsConfig.APPLICATION_ID_CONFIG, applicationId);
 		props.put(StreamsConfig.APPLICATION_SERVER_CONFIG, applicationServer.host() + ":" + applicationServer.port());
 		props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServer);
+		props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+
+		return props;
+	}
+
+	static Properties serializationConfig()
+	{
+		Properties props = new Properties();
+
 		props.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
 		props.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
-		props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
 
 		return props;
 	}
 
-	@Bean
+	@Bean(initMethod = "start", destroyMethod = "stop")
 	public QueryStreamProcessor streamProcessor(
 			Properties streamProcessorProperties,
 			HostInfo applicationServer,
@@ -72,12 +88,24 @@ public class QueryApplicationConfiguration
 			ObjectMapper mapper,
 			ConfigurableApplicationContext context)
 	{
-		return new QueryStreamProcessor(
+		QueryStreamProcessor streamProcessor = new QueryStreamProcessor(
 				streamProcessorProperties,
 				applicationServer,
 				applicationProperties.getUsersInputTopic(),
 				applicationProperties.getRankingInputTopic(),
-				mapper,
-				context);
+				mapper);
+
+		streamProcessor.streams.setUncaughtExceptionHandler((Throwable e) ->
+		{
+			log.error("Unexpected error!", e);
+			CompletableFuture.runAsync(() ->
+			{
+				log.info("Stopping application...");
+				SpringApplication.exit(context, () -> 1);
+			});
+			return SHUTDOWN_CLIENT;
+		});
+
+		return streamProcessor;
 	}
 }