JAL-3878 Change Cache.log calls to Console

[jalview.git] / src / jalview / ws2 / client / api / AbstractWebServiceDiscoverer.java

diff --git a/src/jalview/ws2/client/api/AbstractWebServiceDiscoverer.java b/src/jalview/ws2/client/api/AbstractWebServiceDiscoverer.java
index 6a81410..c2c7db1 100644 (file)
--- a/src/jalview/ws2/client/api/AbstractWebServiceDiscoverer.java
+++ b/src/jalview/ws2/client/api/AbstractWebServiceDiscoverer.java
@@ -11,6 +11,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.ws2.actions.api.ActionI;
 import jalview.ws2.api.WebService;
 
@@ -60,12 +61,12 @@ public abstract class AbstractWebServiceDiscoverer implements WebServiceDiscover
         valid.add(new URL(url));
       } catch (MalformedURLException e)
       {
-        Cache.log.warn(String.format(
+        Console.warn(String.format(
             "Problem whilst trying to make a URL from '%s'. " +
                 "This was probably due to malformed comma-separated-list " +
                 "in the %s entry of ${HOME}/.jalview-properties",
             Objects.toString(url, "<null>"), key));
-        Cache.log.debug("Exception occurred while reading url list", e);
+        Console.debug("Exception occurred while reading url list", e);
       }
     }
     return valid;
@@ -133,7 +134,7 @@ public abstract class AbstractWebServiceDiscoverer implements WebServiceDiscover
   @Override
   public synchronized final CompletableFuture<List<WebService<?>>> startDiscoverer()
   {
-    Cache.log.debug("Requesting service discovery");
+    Console.debug("Requesting service discovery");
     while (true)
     {
       if (state.get() == AGAIN)
@@ -142,23 +143,23 @@ public abstract class AbstractWebServiceDiscoverer implements WebServiceDiscover
       }
       if (state.compareAndSet(END, BEGIN) || state.compareAndSet(BEGIN, AGAIN))
       {
-        Cache.log.debug("State changed to " + state.get());
+        Console.debug("State changed to " + state.get());
         final var oldTask = discoveryTask;
         CompletableFuture<List<WebService<?>>> task = oldTask
             .handleAsync((_r, _e) -> {
-              Cache.log.info("Reloading services for " + this);
+              Console.info("Reloading services for " + this);
               fireServicesChanged(services = Collections.emptyList());
               var allServices = new ArrayList<WebService<?>>();
               for (var url : getUrls())
               {
-                Cache.log.info("Fetching list of services from " + url);
+                Console.info("Fetching list of services from " + url);
                 try
                 {
                   allServices.addAll(fetchServices(url));
                 }
                 catch (IOException e)
                 {
-                  Cache.log.error("Failed to get services from " + url, e);
+                  Console.error("Failed to get services from " + url, e);
                 }
               }
               return services = allServices;
@@ -170,15 +171,15 @@ public abstract class AbstractWebServiceDiscoverer implements WebServiceDiscover
               // should never happen, throw exception to break the loop just in case
               throw new AssertionError();
             if (state.compareAndSet(BEGIN, END) || state.compareAndSet(AGAIN, BEGIN))
-              Cache.log.debug("Discovery ended, state is " + state.get());
+              Console.debug("Discovery ended, state is " + state.get());
               break;
           }
           if (services != null)
             fireServicesChanged(services);
           return null;
         });
-        Cache.log.debug("Spawned task " + task);
-        Cache.log.debug("Killing task " + oldTask);
+        Console.debug("Spawned task " + task);
+        Console.debug("Killing task " + oldTask);
         oldTask.cancel(false);
         return discoveryTask = task;
       }
@@ -199,7 +200,7 @@ public abstract class AbstractWebServiceDiscoverer implements WebServiceDiscover
       }
       catch (Exception e)
       {
-        Cache.log.warn(e);
+        Console.warn(e.toString(), e);
       }
     }
   }