Revision: 7003
Author: mmen...@google.com
Date: Wed Nov 18 13:50:42 2009
Log: Tweak log levels and don't launchURLs if we are using the RemoteUI.
http://code.google.com/p/google-web-toolkit/source/detail?r=7003
Modified:
/trunk/dev/core/src/com/google/gwt/dev/DevMode.java
/trunk/dev/core/src/com/google/gwt/dev/DevModeBase.java
/trunk/dev/core/src/com/google/gwt/dev/shell/BrowserListener.java
/trunk/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
/trunk/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteUI.java
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/DevMode.java Wed Nov 18 11:51:07
2009
+++ /trunk/dev/core/src/com/google/gwt/dev/DevMode.java Wed Nov 18 13:50:42
2009
@@ -319,10 +319,10 @@
servletValidator = ServletValidator.create(getTopLogger(), webXml);
}
- TreeLogger branch = getTopLogger().branch(TreeLogger.INFO,
+ TreeLogger branch = getTopLogger().branch(TreeLogger.TRACE,
"Loading modules");
for (String moduleName : options.getModuleNames()) {
- TreeLogger moduleBranch = branch.branch(TreeLogger.INFO, moduleName);
+ TreeLogger moduleBranch = branch.branch(TreeLogger.TRACE,
moduleName);
try {
ModuleDef module = loadModule(moduleBranch, moduleName, false);
// Create a hard reference to the module to avoid gc-ing it until
we
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/DevModeBase.java Wed Nov 18
13:24:48 2009
+++ /trunk/dev/core/src/com/google/gwt/dev/DevModeBase.java Wed Nov 18
13:50:42 2009
@@ -737,7 +737,7 @@
// Eager AWT init for OS X to ensure safe coexistence with SWT.
BootStrapPlatform.initGui();
- if (startUp()) {
+ if (startUp() && !options.useRemoteUI()) {
// The web server is running now, so launch browsers for startup
urls.
launchStartupUrls(getTopLogger());
}
@@ -890,6 +890,7 @@
getTopLogger().log(TreeLogger.ERROR, "Invalid URL " + url, e);
throw new UnableToCompleteException();
}
+
final URL helpInfoUrl = parsedUrl;
getTopLogger().log(TreeLogger.INFO,
"Waiting for browser connection to " + url, null, new HelpInfo() {
@@ -989,7 +990,7 @@
return false;
}
options.setPort(resultPort);
- getTopLogger().log(TreeLogger.INFO,
+ getTopLogger().log(TreeLogger.TRACE,
"Started web server on port " + resultPort);
}
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/shell/BrowserListener.java Fri
Nov 13 10:26:21 2009
+++ /trunk/dev/core/src/com/google/gwt/dev/shell/BrowserListener.java Wed
Nov 18 13:50:42 2009
@@ -62,15 +62,15 @@
listenSocket.setReuseAddress(true);
listenSocket.bind(new InetSocketAddress(port));
- logger.log(TreeLogger.INFO, "Listening at: "
- + listenSocket.getLocalSocketAddress(), null);
+ logger.log(TreeLogger.TRACE, "Started code server on port "
+ + listenSocket.getLocalPort(), null);
listenThread = new Thread() {
@Override
public void run() {
while (true) {
try {
Socket sock = listenSocket.accept();
- TreeLogger branch = logger.branch(TreeLogger.INFO,
+ TreeLogger branch = logger.branch(TreeLogger.TRACE,
"Connection received from "
+ sock.getInetAddress().getCanonicalHostName() + ":"
+ sock.getPort());
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
Fri Oct 16 20:22:17 2009
+++ /trunk/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
Wed Nov 18 13:50:42 2009
@@ -145,7 +145,7 @@
}
public void info(String msg, Object arg0, Object arg1) {
- logger.log(TreeLogger.INFO, format(msg, arg0, arg1));
+ logger.log(TreeLogger.TRACE, format(msg, arg0, arg1));
}
public boolean isDebugEnabled() {
@@ -471,7 +471,7 @@
@Override
public ServletContainer start(TreeLogger logger, int port, File
appRootDir)
throws Exception {
- TreeLogger branch = logger.branch(TreeLogger.INFO,
+ TreeLogger branch = logger.branch(TreeLogger.TRACE,
"Starting Jetty on port " + port, null);
checkStartParams(branch, port, appRootDir);
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteUI.java Thu
Nov 12 13:26:49 2009
+++ /trunk/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteUI.java Wed
Nov 18 13:50:42 2009
@@ -104,20 +104,18 @@
synchronized (modulesLock) {
modules.add(handle);
}
- // Copied from SwingUI.loadModule
- TreeLogger branch = moduleLogger.branch(TreeLogger.INFO, "Loading
module "
- + moduleName);
+
if (url != null) {
- branch.log(TreeLogger.INFO, "Top URL: " + url);
+ moduleLogger.log(TreeLogger.SPAM, "Top URL: " + url);
}
- branch.log(TreeLogger.INFO, "User agent: " + userAgent);
- branch.log(TreeLogger.TRACE, "Remote socket: " + remoteSocket);
+ moduleLogger.log(TreeLogger.SPAM, "User agent: " + userAgent);
+ moduleLogger.log(TreeLogger.SPAM, "Remote socket: " + remoteSocket);
if (tabKey != null) {
- branch.log(TreeLogger.DEBUG, "Tab key: " + tabKey);
+ moduleLogger.log(TreeLogger.SPAM, "Tab key: " + tabKey);
}
if (sessionKey != null) {
- branch.log(TreeLogger.DEBUG, "Session key: " + sessionKey);
+ moduleLogger.log(TreeLogger.SPAM, "Session key: " + sessionKey);
}
return handle;
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
