From 509b149f31c5ce05beb168e34ce08d89a88c634c Mon Sep 17 00:00:00 2001 From: Britta Weber Date: Wed, 19 May 2021 09:07:02 +0200 Subject: [PATCH] log the exception if download of elevation file failed see https://forum.step.esa.int/t/403-for-skywatch-auxdata-bucket/30285/19 --- .../dem/dataio/srtm3_geotiff/SRTM3GeoTiffFile.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/snap-dem/src/main/java/org/esa/snap/dem/dataio/srtm3_geotiff/SRTM3GeoTiffFile.java b/snap-dem/src/main/java/org/esa/snap/dem/dataio/srtm3_geotiff/SRTM3GeoTiffFile.java index be36d538144..8aa5d2de800 100644 --- a/snap-dem/src/main/java/org/esa/snap/dem/dataio/srtm3_geotiff/SRTM3GeoTiffFile.java +++ b/snap-dem/src/main/java/org/esa/snap/dem/dataio/srtm3_geotiff/SRTM3GeoTiffFile.java @@ -23,6 +23,8 @@ import java.io.File; import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Holds information about a dem file. @@ -32,9 +34,10 @@ public final class SRTM3GeoTiffFile extends ElevationFile { private final SRTM3GeoTiffElevationModel demModel; private static final String remoteHTTP1 = "https://download.esa.int/step/auxdata/dem/SRTM90/tiff/"; - private static final String remoteHTTP2 = "http://skywatch-auxdata.s3-us-west-2.amazonaws.com/dem/SRTM90/tiff/"; private static String remoteHTTP = Settings.instance().get("DEM.srtm3GeoTiffDEM_HTTP", remoteHTTP1); + + private static final Logger logger = Logger.getLogger(SRTM3GeoTiffFile.class.getName()); static { // if old property files still contain old bucket if(remoteHTTP.startsWith("http://srtm.csi.cgiar.org") || remoteHTTP.startsWith("http://cgiar-csi-srtm")) { @@ -56,14 +59,17 @@ protected ElevationTile createTile(final Product product) throws IOException { protected Boolean getRemoteFile() { try { boolean found = getRemoteHttpFile(remoteHTTP); - if(!found) { + if (!found) { + logger.log(Level.WARNING, localZipFile + " not found at " + remoteHTTP + "trying " + remoteHTTP1); found = getRemoteHttpFile(remoteHTTP1); } return found; } catch (Exception e) { + logger.log(Level.WARNING, "Unable to download " + localZipFile + " from " + remoteHTTP + " or " + remoteHTTP1, e); try { return getRemoteHttpFile(remoteHTTP1); } catch (Exception e2) { + logger.log(Level.SEVERE, "Unable to download " + localZipFile + " from " + remoteHTTP1, e2); return false; } }