code cleanup

Author: hmottestad

tools/server-boot/src/main/dist/config/application.properties

@@ -7,8 +7,5 @@ management.server.port=-1
 management.endpoints.enabled-by-default=false
 management.endpoints.web.exposure.exclude=*
 
-# Prevent Spring Boot from auto-configuring Solr unless explicitly requested.
-rdf4j.solr.enabled=false
-
 # Keep existing classpath defaults (e.g. bean definition overriding) by loading this file via
 # spring.config.additional-location rather than replacing the built-in configuration.

tools/server-boot/src/main/java/org/eclipse/rdf4j/tools/serverboot/SignalShutdownHandler.java

@@ -73,22 +73,29 @@ private void handleSignal(String signalName) {
 
 		logger.info("SIG{} received; initiating graceful shutdown.", signalName);
 		ConfigurableApplicationContext context = contextRef.get();
+		int exitCode = 0;
 		if (context != null) {
 			try {
-				int exitCode = SpringApplication.exit(context, () -> 0);
+				exitCode = SpringApplication.exit(context, () -> 0);
 				if (context.isActive()) {
 					context.close();
 				}
 				logger.info("Application context closed after SIG{}, exit status {}", signalName, exitCode);
-				System.exit(exitCode);
 			} catch (Throwable e) {
 				logger.warn("Error while shutting down after SIG{}", signalName, e);
+				exitCode = 1;
 			}
 		} else {
 			logger.warn("SIG{} received before application context became available; shutting down immediately.",
 					signalName);
 		}
 
+		try {
+			System.exit(exitCode);
+		} catch (SecurityException e) {
+			logger.error("System.exit({}) blocked by security manager after SIG{}", exitCode, signalName, e);
+		}
+
 	}
 
 	private static void startDelayedSystemExitThread(String signalName) {

tools/server-boot/src/main/resources/META-INF/spring.factories

@@ -1,2 +1 @@
 org.springframework.boot.env.EnvironmentPostProcessor=\
-org.eclipse.rdf4j.tools.serverboot.config.SolrAutoConfigurationDisabler

tools/server-boot/src/main/resources/application.properties

@@ -1,2 +1 @@
 spring.main.allow-bean-definition-overriding=true
-rdf4j.solr.enabled=false