Merge pull request #978 from AdoptOpenJDK/OptimiseLogging

Optimise logging

Author: sclassen

common/src/main/java/net/adoptopenjdk/icedteaweb/lockingfile/LockableFile.java

@@ -317,11 +317,9 @@ public void lock() throws IOException {
                 return;
             }
 
-            logger.debug("Trying to create lock file {}", lockFile.getPath());
             while (file.exists() && !tryLock()) {
                 try {
                     Thread.sleep(500);
-                    logger.debug("Trying to create lock file {}", lockFile.getPath());
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
@@ -344,7 +342,6 @@ public boolean tryLock() throws IOException {
                 logger.debug("Could not create lock file {}", lockFile.getPath());
                 return false;
             }
-            logger.debug("Created lock file {}", lockFile.getPath());
             lockFile.deleteOnExit();
             return true;
         }

core/src/main/java/net/sourceforge/jnlp/JNLPFileFactory.java

@@ -125,6 +125,9 @@ private InputStream openURL(final URL location, final VersionString version, fin
             final ResourceTracker tracker = new ResourceTracker(false, DownloadOptions.NONE, policy); // no prefetch
             tracker.addResource(location, version);
             final File f = tracker.getCacheFile(location);
+            if (f == null) {
+                throw new IOException("Error fetching file from  " + location);
+            }
             return new FileInputStream(f);
         } catch (IOException ex) {
             throw ex;

core/src/main/java/net/sourceforge/jnlp/runtime/JNLPPolicy.java

@@ -230,7 +230,7 @@ private Policy getPolicyFromConfig(String key) {
      * @return a policy based on the configuration set by the user
      */
     private Policy getPolicyFromUrl(String policyLocation) {
-        LOG.debug("Begin getPolicyFromUrl({})", policyLocation);
+        LOG.debug("getPolicyFromUrl({})", policyLocation);
         Policy policy = null;
         if (policyLocation != null) {
             try {
@@ -241,14 +241,11 @@ private Policy getPolicyFromUrl(String policyLocation) {
                 } else {
                     policyUri = new URI(policyLocation.replace("\\", "/"));
                 }
-                LOG.debug("Start Policy.getInstance({})", policyUri.toString());
                 policy = getInstance("JavaPolicy", new URIParameter(policyUri));
-                LOG.debug("End Policy.getInstance({})", policyUri.toString());
             } catch (Exception e) {
                 LOG.error("Error while loading the policy from URL " + policyLocation, e);
             }
         }
-        LOG.debug("End getPolicyFromUrl()");
         return policy;
     }
 

core/src/main/java/net/sourceforge/jnlp/runtime/JNLPRuntime.java

@@ -257,9 +257,7 @@ public static void initialize() throws IllegalStateException {
 
         ServiceManager.setServiceManagerStub(new XServiceManagerStub()); // ignored if we're running under Web Start
 
-        LOG.debug("Start get JavaPolicy");
         policy = new JNLPPolicy();
-        LOG.debug("Finished get JavaPolicy");
 
         security = new JNLPSecurityManager(); // side effect: create JWindow
 
@@ -296,10 +294,8 @@ public static void initialize() throws IllegalStateException {
 
         // plug in a custom authenticator and proxy selector
         Authenticator.setDefault(new JNLPAuthenticator());
-        LOG.debug("Start Proxy Selector");
         ProxySelector proxySelector = getExtensionPoint().createProxySelector(getConfiguration());
         ProxySelector.setDefault(proxySelector);
-        LOG.debug("Finished Proxy Selector");
 
         // Restrict access to netx classes
         Security.setProperty("package.access",

core/src/main/java/net/sourceforge/jnlp/security/KeystorePasswordAttempter.java

@@ -137,15 +137,13 @@ Key unlockKeystore(KeystoreOperation operation) throws KeyStoreException, NoSuch
         for (int i = 0; i < localPasses.size(); i++) {
             final SavedPassword pass = localPasses.get(i);
             try {
-                LOG.debug("unlockKeyStore: Operating Keystore {}", keyStorePath);
                 //we expect, that any keystore is loaded before read.
                 //so we are writing by correct password
                 //if no successful password was provided during reading, then finish(firstEx); will save us from overwrite
                 final Key result = operation.operateKeystore(pass.pass);
                 //ok we were successful
                 //save the loading password for storing purposes (and another reading too)
                 if (operation.f != null) {
-                    LOG.debug("unlockKeyStore: Store successful pass for file {}",  keyStorePath);
                     successfulPerKeystore.put(keyStorePath, pass);
                 }
                 return result;

core/src/main/java/net/sourceforge/jnlp/security/SecurityUtil.java

@@ -354,7 +354,6 @@ Key operateKeystore(char[] pass) throws KeyStoreException, NoSuchAlgorithmExcept
 
     public static void loadKeyStore(KeyStore ks, File f) throws IOException, NoSuchAlgorithmException, CertificateException {
         try {
-            LOG.debug("Loading Keystore {}", f != null ? f.toString() : "Unknown");
             KeystorePasswordAttempter.INSTANCE.unlockKeystore(
                     new KeystorePasswordAttempter.KeystoreOperation(ks, f) {
 

core/src/main/java/net/sourceforge/jnlp/util/RestrictedFileUtils.java

@@ -128,7 +128,6 @@ private static void createRestrictedFile(File file, boolean isDir) throws IOExce
                 List<AclEntry> list = new ArrayList<>();
                 for (AclEntry ae : view.getAcl()) {
                     if (principalInWinSIDS(ae.principal())) {
-                        LOG.debug("Allowing permissions on restricted file {} for principal {} : {} ", tempFile.getAbsolutePath(), ae.principal().getName(), getSIDForPrincipal(ae.principal()));
                         list.add(AclEntry.newBuilder()
                                 .setType(AclEntryType.ALLOW)
                                 .setPrincipal(ae.principal())
@@ -138,7 +137,6 @@ private static void createRestrictedFile(File file, boolean isDir) throws IOExce
                     }
                 }
                 // Add permissions for the owner
-                LOG.debug("Allowing permissions on restricted file {} for principal {} : {} ", tempFile.getAbsolutePath(), view.getOwner().getName(), getSIDForPrincipal(view.getOwner()));
                 list.add(AclEntry.newBuilder()
                         .setType(AclEntryType.ALLOW)
                         .setPrincipal(view.getOwner())