added shutdown hook

Author: TomBlock

CHANGES.md

@@ -1,3 +1,6 @@
+### Updates from version 1.5.4 to 1.5.5
+* added shutdown hook for resource cleanup on hard shutdowns 
+
 ### Updates from version 1.5.3 to 1.5.4
 * updated to use SNAP version 8.0.5 / S3TBX version 8.0.3
 * update Postgres/PostGIS drivers

core/src/main/java/com/bc/fiduceo/tool/ShutdownHook.java

@@ -0,0 +1,34 @@
+package com.bc.fiduceo.tool;
+
+import com.bc.fiduceo.db.Storage;
+import com.bc.fiduceo.log.FiduceoLogger;
+import com.bc.fiduceo.util.TempFileUtils;
+
+import java.sql.SQLException;
+
+public class ShutdownHook extends Thread {
+
+    private final ToolContext context;
+
+    public ShutdownHook(ToolContext context) {
+        this.context = context;
+    }
+
+    @Override
+    public void run() {
+        final TempFileUtils tempFileUtils = context.getTempFileUtils();
+        if (tempFileUtils != null) {
+            tempFileUtils.cleanup();
+        }
+
+        final Storage storage = context.getStorage();
+        if (storage != null) {
+            try {
+                storage.close();
+            } catch (SQLException e) {
+                FiduceoLogger.getLogger().severe(e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
+}

ingestion-tool/src/main/java/com/bc/fiduceo/ingest/IngestionTool.java

@@ -33,6 +33,7 @@
 import com.bc.fiduceo.reader.AcquisitionInfo;
 import com.bc.fiduceo.reader.Reader;
 import com.bc.fiduceo.reader.ReaderFactory;
+import com.bc.fiduceo.tool.ShutdownHook;
 import com.bc.fiduceo.tool.ToolContext;
 import com.bc.fiduceo.util.TempFileUtils;
 import com.bc.fiduceo.util.TimeUtils;
@@ -76,6 +77,8 @@ void run(CommandLine commandLine) throws IOException, SQLException {
 
         logger.info("Successfully initialized tool");
 
+        Runtime.getRuntime().addShutdownHook(new ShutdownHook(context));
+
         try {
             ingestMetadata(context, sensorType, processingVersion);
         } finally {

matchup-tool/src/main/java/com/bc/fiduceo/matchup/MatchupTool.java

@@ -32,6 +32,7 @@
 import com.bc.fiduceo.matchup.strategy.MatchupStrategyFactory;
 import com.bc.fiduceo.matchup.writer.*;
 import com.bc.fiduceo.reader.ReaderFactory;
+import com.bc.fiduceo.tool.ShutdownHook;
 import com.bc.fiduceo.tool.ToolContext;
 import com.bc.fiduceo.util.NetCDFUtils;
 import com.bc.fiduceo.util.TempFileUtils;
@@ -297,6 +298,9 @@ static String createDistanceVariableName(VariablesConfiguration variablesConfigu
 
     void run(CommandLine commandLine) throws IOException, SQLException, InvalidRangeException {
         final ToolContext context = initialize(commandLine);
+
+        Runtime.getRuntime().addShutdownHook(new ShutdownHook(context));
+
         final MmdWriterConfig mmdWriterConfig = loadWriterConfig(commandLine);
 
         try {
@@ -340,7 +344,7 @@ private ToolContext initialize(CommandLine commandLine) throws IOException, SQLE
         final ValidationResult validationResult = useCaseConfig.checkValid();
         if (!validationResult.isValid()) {
             final StringBuilder builder = createErrorMessage(validationResult);
-            throw new IllegalArgumentException("Use case configuration errors: " + builder.toString());
+            throw new IllegalArgumentException("Use case configuration errors: " + builder);
         }
         context.setUseCaseConfig(useCaseConfig);
 

post-processing-tool/src/main/java/com/bc/fiduceo/post/PostProcessingToolMain.java

@@ -22,6 +22,7 @@
 
 
 import com.bc.fiduceo.log.FiduceoLogger;
+import com.bc.fiduceo.tool.ShutdownHook;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.ParseException;
@@ -47,6 +48,7 @@ public static void main(String[] args) {
 
         try {
             final PostProcessingContext context = PostProcessingTool.initializeContext(commandLine);
+            Runtime.getRuntime().addShutdownHook(new ShutdownHook(context));
             final PostProcessingTool tool = new PostProcessingTool(context);
             tool.runPostProcessing();
         } catch (Throwable e) {