Changeset 31884

Timestamp:

2017-08-15T19:17:46+12:00 (6 years ago)

Author:

ak19

Message:

Much simpler. If proxy env vars were already set upon GLI launch, they still don't turn up in Java System vars. This means that we print out the messages of overriding and restoring variables without having to actually do anything (no restoring of Java System vars with the original env vars when running GLI, as the Java System vars remain empty as at startup.)

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -1482 +1482 @@
     // https://docs.oracle.com/javase/8/docs/technotes/guides/net/proxies.html
     // https://stackoverflow.com/questions/14243590/proxy-settings-in-java  
+
+    // Just need to warn the user that we're overriding proxy settings using custom defined proxy settings
+    // and returning to using the original proxy settings when custom defined proxy settings are turned off
+    // We don't actually need to store/restore the original settings, as Java system vars like http.proxyHost
+    // http.proxyPort don't seem to be set even if on GLI startup the env vars like http(s)_proxy were already set.
+
     
     if(use_proxy) {
         if(System.getenv(protocol+"_proxy") != null) {
         System.err.println("Overriding original "+protocol+" proxy settings");
-        
-        // first store the original settings, but only if we haven't already stored them for this protocol
-        if(startup_proxy_settings.getProperty(protocol+".proxyHost") == null) {
-            ///System.err.println("@@@ Overriding with: " + System.getProperty(protocol+".proxyHost", ""));
-            startup_proxy_settings.setProperty(protocol+".proxyHost", System.getProperty(protocol+".proxyHost", ""));
-            startup_proxy_settings.setProperty(protocol+".proxyPort", System.getProperty(protocol+".proxyPort", ""));
-
-            //if(protocol.equals("http")) {
-            //startup_proxy_settings.setProperty(protocol+".proxyType", System.getProperty(protocol+".proxyType", ""));
-            //startup_proxy_settings.setProperty(protocol+".proxySet", System.getProperty(protocol+".proxySet", ""));
-            //}
-        }
         }
         
-        // finally can now set the custom proxy defined through GLI for this protocol
+        // set the custom proxy defined through GLI for this protocol
         System.setProperty(protocol+".proxyHost", Configuration.getString("general."+protocol.toUpperCase()+"_proxy_host", true));
         System.setProperty(protocol+".proxyPort", Configuration.getString("general."+protocol.toUpperCase()+"_proxy_port", true));
 
         // Not sure what proxyType is. And proxySet ceased to exist since JDK 6 or before. See links above.
-        // But we used to set them both for HTTP before, so still doing so for proxyType which may or may not exist
-        // but proxySet doesn't exist anymore, so not continuing with that.
+        // But we used to set them both for HTTP before, so still doing so for proxyType, since it may or may not exist
+        // But proxySet doesn't exist anymore, so not continuing with that.
         if(protocol.equals("http")) {
         System.setProperty(protocol+".proxyType", "4");
@@ -1519 +1513 @@
         if(System.getenv(protocol+"_proxy") != null) {
         System.err.println("Restoring original "+protocol+" proxy settings");
-        System.setProperty(protocol+".proxyHost", startup_proxy_settings.getProperty(protocol+".proxyHost"));
-        System.setProperty(protocol+".proxyPort", startup_proxy_settings.getProperty(protocol+".proxyPort"));
-
-        //if(protocol.equals("http")) {
-            //System.setProperty(protocol+".proxyHost", startup_proxy_settings.getProperty(protocol+".proxyType"));
-            //System.setProperty(protocol+".proxyPort", startup_proxy_settings.getProperty(protocol+".proxySet"));
-        //}
         }
-        else {
-        System.setProperty(protocol+".proxyHost", "");
-        System.setProperty(protocol+".proxyPort", "");
-        //if(protocol.equals("http")) {
-            //System.setProperty(protocol+".proxySet", "false");
-        //}
-        }
-
+        
+        System.setProperty(protocol+".proxyHost", "");
+        System.setProperty(protocol+".proxyPort", "");
+        //if(protocol.equals("http")) {
+        //System.setProperty(protocol+".proxySet", "false");
+        //}      
     }
     }