X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FAWSThread.java;h=b64a526efbeff2e57e341d04ef6b9cdb0bbcf646;hb=cb8e52fbbc5f725e3f7f48c672cdddb0690bd978;hp=2ef525640850f891bd26f9ed8b2c0c729bb35cc8;hpb=f0a4a06301b7c7c4f103af39a10da7e0b3b4f084;p=jalview.git diff --git a/src/jalview/ws/AWSThread.java b/src/jalview/ws/AWSThread.java index 2ef5256..b64a526 100644 --- a/src/jalview/ws/AWSThread.java +++ b/src/jalview/ws/AWSThread.java @@ -20,7 +20,7 @@ */ package jalview.ws; -import jalview.bin.Cache; +import jalview.bin.Console; import jalview.datamodel.AlignedCodonFrame; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; @@ -127,17 +127,17 @@ public abstract class AWSThread extends Thread throw (new Exception( "Timed out when communicating with server\nTry again later.\n")); } - jalview.bin.Cache.log.debug("Job " + j + " Result state " + Console.debug("Job " + j + " Result state " + jobs[j].getState() + "(ServerError=" + jobs[j].isServerError() + ")"); } catch (Exception ex) { // Deal with Transaction exceptions wsInfo.appendProgressText(jobs[j].jobnum, MessageManager - .formatMessage("info.server_exception", new Object[] { - WebServiceName, ex.getMessage() })); + .formatMessage("info.server_exception", new Object[] + { WebServiceName, ex.getMessage() })); // always output the exception's stack trace to the log - Cache.log.warn(WebServiceName + " job(" + jobs[j].jobnum + Console.warn(WebServiceName + " job(" + jobs[j].jobnum + ") Server exception."); // todo: could limit trace to cause if this is a SOAPFaultException. ex.printStackTrace(); @@ -145,7 +145,7 @@ public abstract class AWSThread extends Thread if (jobs[j].allowedServerExceptions > 0) { jobs[j].allowedServerExceptions--; - Cache.log.debug("Sleeping after a server exception."); + Console.debug("Sleeping after a server exception."); try { Thread.sleep(5000); @@ -155,7 +155,7 @@ public abstract class AWSThread extends Thread } else { - Cache.log.warn("Dropping job " + j + " " + jobs[j].jobId); + Console.warn("Dropping job " + j + " " + jobs[j].jobId); jobs[j].subjobComplete = true; wsInfo.setStatus(jobs[j].jobnum, WebserviceInfo.STATE_STOPPED_SERVERERROR); @@ -167,10 +167,10 @@ public abstract class AWSThread extends Thread jobs[j].clearResponse(); // may contain out of date result data wsInfo.setStatus(jobs[j].jobnum, WebserviceInfo.STATE_STOPPED_ERROR); - Cache.log.error("Out of memory when retrieving Job " + j + Console.error("Out of memory when retrieving Job " + j + " id:" + WsUrl + "/" + jobs[j].jobId, er); - new jalview.gui.OOMWarning("retrieving result for " - + WebServiceName, er); + new jalview.gui.OOMWarning( + "retrieving result for " + WebServiceName, er); System.gc(); } } @@ -185,8 +185,8 @@ public abstract class AWSThread extends Thread Thread.sleep(5000); } catch (InterruptedException e) { - Cache.log - .debug("Interrupted sleep waiting for next job poll.", e); + Console.debug("Interrupted sleep waiting for next job poll.", + e); } // System.out.println("I'm alive "+alTitle); } @@ -197,11 +197,11 @@ public abstract class AWSThread extends Thread } else { - Cache.log - .debug("WebServiceJob poll loop finished with no jobs created."); + Console.debug( + "WebServiceJob poll loop finished with no jobs created."); wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR); - wsInfo.appendProgressText(MessageManager - .getString("info.no_jobs_ran")); + wsInfo.appendProgressText( + MessageManager.getString("info.no_jobs_ran")); wsInfo.setFinishedNoResults(); } }