Changeset 9414 in josm for trunk

Timestamp:

2016-01-11T19:07:11+01:00 (9 years ago)

Author:

simon04

Message:

see #8824 - Fail fast when initializing imagery entries while starting

Use a short HTTP connect timeout of 1s for fetching the entries

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryLayerInfo.java (modified) (5 diffs)
• gui/preferences/imagery/ImageryPreference.java (modified) (3 diffs)
• io/CachedFile.java (modified) (3 diffs)
• io/imagery/ImageryReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -63 +63 @@
     }
 
-    public void load() {
+    /**
+     * Loads the custom as well as default imagery entries.
+     * @param fastFail whether opening HTTP connections should fail fast, see {@link ImageryReader#setFastFail(boolean)}
+     */
+     public void load(boolean fastFail) {
         clear();
         List<ImageryPreferenceEntry> entries = Main.pref.getListOfStructs("imagery.entries", null, ImageryPreferenceEntry.class);
@@ -77 +81 @@
             Collections.sort(layers);
         }
-        loadDefaults(false, true);
+        loadDefaults(false, true, fastFail);
     }
 
@@ -89 +93 @@
      * @param clearCache if true, clear the cache and start a fresh download.
      * @param quiet whether not the loading should be performed using a {@link PleaseWaitRunnable} in the background
-     */
-    public void loadDefaults(boolean clearCache, boolean quiet) {
-        final DefaultEntryLoader loader = new DefaultEntryLoader(clearCache);
+     * @param fastFail whether opening HTTP connections should fail fast, see {@link ImageryReader#setFastFail(boolean)}
+     */
+    public void loadDefaults(boolean clearCache, boolean quiet, boolean fastFail) {
+        final DefaultEntryLoader loader = new DefaultEntryLoader(clearCache, fastFail);
         if (quiet) {
             loader.realRun();
             loader.finish();
         } else {
-            Main.worker.execute(new DefaultEntryLoader(clearCache));
+            Main.worker.execute(new DefaultEntryLoader(clearCache, fastFail));
         }
     }
@@ -106 +111 @@
 
         private final boolean clearCache;
+        private final boolean fastFail;
         private final List<ImageryInfo> newLayers = new ArrayList<>();
         private transient ImageryReader reader;
         private transient boolean canceled;
 
-        DefaultEntryLoader(boolean clearCache) {
+        DefaultEntryLoader(boolean clearCache, boolean fastFail) {
             super(tr("Update default entries"));
             this.clearCache = clearCache;
+            this.fastFail = fastFail;
         }
 
@@ -144 +151 @@
             try {
                 reader = new ImageryReader(source);
+                reader.setFastFail(fastFail);
                 Collection<ImageryInfo> result = reader.parse();
                 newLayers.addAll(result);

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -156 +156 @@
         layerInfo.save();
         ImageryLayerInfo.instance.clear();
-        ImageryLayerInfo.instance.load();
+        ImageryLayerInfo.instance.load(false);
         Main.main.menu.imageryMenu.refreshOffsetMenu();
         OffsetBookmark.saveBookmarks();
@@ -642 +642 @@
             @Override
             public void actionPerformed(ActionEvent evt) {
-                layerInfo.loadDefaults(true, false);
+                layerInfo.loadDefaults(true, false, false);
                 defaultModel.fireTableDataChanged();
                 defaultTable.getSelectionModel().clearSelection();
@@ -946 +946 @@
      */
     public static void initialize() {
-        ImageryLayerInfo.instance.load();
+        ImageryLayerInfo.instance.load(true);
         OffsetBookmark.loadBookmarks();
         Main.main.menu.imageryMenu.refreshImageryMenu();

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -69 +69 @@
     protected CachingStrategy cachingStrategy;
 
+    private transient boolean fastFail;
     private transient HttpClient activeConnection;
     protected File cacheFile;
@@ -159 +160 @@
         this.httpHeaders.putAll(headers);
         return this;
+    }
+
+    /**
+     * Sets whether opening HTTP connections should fail fast, i.e., whether a
+     * {@link HttpClient#setConnectTimeout(int) low connect timeout} should be used.
+     * @param fastFail whether opening HTTP connections should fail fast
+     */
+    public void setFastFail(boolean fastFail) {
+        this.fastFail = fastFail;
     }
 
@@ -433 +443 @@
                     .setIfModifiedSince(ifModifiedSince == null ? 0L : ifModifiedSince)
                     .setHeaders(httpHeaders);
+            if (fastFail) {
+                activeConnection.setReadTimeout(1000);
+            }
             final HttpClient.Response con = activeConnection.connect();
             if (ifModifiedSince != null && con.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.imagery.Shape;
 import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Utils;
@@ -33 +33 @@
     private final String source;
     private transient CachedFile cachedFile;
+    private transient boolean fastFail;
 
     private enum State {
@@ -56 +57 @@
         try {
             cachedFile = new CachedFile(source);
+            cachedFile.setFastFail(fastFail);
             try (BufferedReader in = cachedFile
                     .setMaxAge(CachedFile.DAYS)
@@ -359 +361 @@
     }
 
+    /**
+     * Sets whether opening HTTP connections should fail fast, i.e., whether a
+     * {@link HttpClient#setConnectTimeout(int) low connect timeout} should be used.
+     * @param fastFail whether opening HTTP connections should fail fast
+     * @see CachedFile#setFastFail(boolean)
+     */
+    public void setFastFail(boolean fastFail) {
+        this.fastFail = fastFail;
+    }
+
     @Override
     public void close() throws IOException {