diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java index e911aa27449..62458189f05 100644 --- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java +++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java @@ -113,7 +113,7 @@ public class ConsoleProxyAjaxHandler implements HttpHandler { viewer = ConsoleProxy.getAjaxVncViewer(host, port, sid, tag, ticket, ajaxSessionIdStr); } catch(Exception e) { - s_logger.warn("Failed to create viwer due to " + e.getMessage(), e); + s_logger.warn("Failed to create viewer due to " + e.getMessage(), e); String[] content = new String[] { "", diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java index cd423e5ddfa..614a39ebd37 100644 --- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java +++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java @@ -58,9 +58,12 @@ public class ConsoleProxyGCThread extends Thread { } @Override - public void run() { + public void run() { + + boolean bReportLoad = false; while (true) { - cleanupLogging(); + cleanupLogging(); + bReportLoad = false; s_logger.info("connMap=" + connMap); Enumeration e = connMap.keys(); @@ -85,13 +88,15 @@ public class ConsoleProxyGCThread extends Thread { // close the server connection s_logger.info("Dropping " + client + " which has not been used for " + seconds_unused + " seconds"); client.closeClient(); - - // report load changes - String loadInfo = new ConsoleProxyClientStatsCollector(connMap).getStatsReport(); - ConsoleProxy.reportLoadInfo(loadInfo); - if(s_logger.isDebugEnabled()) - s_logger.debug("Report load change : " + loadInfo); - } + } + + if(bReportLoad) { + // report load changes + String loadInfo = new ConsoleProxyClientStatsCollector(connMap).getStatsReport(); + ConsoleProxy.reportLoadInfo(loadInfo); + if(s_logger.isDebugEnabled()) + s_logger.debug("Report load change : " + loadInfo); + } try { Thread.sleep(1000); } catch (InterruptedException ex) {} }