[gwt-contrib] [google-web-toolkit commit] r5042 - Fixes Jetty TreeLogging so that clearing the log doesn't prevent all subsequent requests ...

[codesite-noreply]

Author: sco...@google.com
Date: Wed Mar 18 12:18:30 2009
New Revision: 5042

Modified:
    releases/1.6/dev/core/src/com/google/gwt/dev/HostedMode.java
     
releases/1.6/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java

Log:
Fixes Jetty TreeLogging so that clearing the log doesn't prevent all  
subsequent requests from getting logged.  This is in line with the 1.5  
behavior.

Suggested by: bruce
Review by: jat

Modified: releases/1.6/dev/core/src/com/google/gwt/dev/HostedMode.java
==============================================================================
--- releases/1.6/dev/core/src/com/google/gwt/dev/HostedMode.java        
(original)
+++ releases/1.6/dev/core/src/com/google/gwt/dev/HostedMode.java        Wed Mar 
18  
12:18:30 2009
@@ -362,9 +362,7 @@
    @Override
    protected int doStartUpServer() {
      try {
-      TreeLogger serverLogger = getTopLogger().branch(TreeLogger.INFO,
-          "Starting HTTP on port " + getPort(), null);
-      server = options.getServletContainerLauncher().start(serverLogger,
+      server = options.getServletContainerLauncher().start(getTopLogger(),
            getPort(), options.getWarDir());
        assert (server != null);
        return server.getPort();

Modified:  
releases/1.6/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
==============================================================================
---  
releases/1.6/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java     
 
(original)
+++  
releases/1.6/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java     
 
Wed Mar 18 12:18:30 2009
@@ -195,34 +195,38 @@
        String msg = "Reloading web app to reflect changes in "
            + appRootDir.getAbsolutePath();
        TreeLogger branch = logger.branch(TreeLogger.INFO, msg);
+      // Temporarily log Jetty on the branch.
+      Log.setLog(new JettyTreeLogger(branch));
        try {
          wac.stop();
-      } catch (Exception e) {
-        branch.log(TreeLogger.ERROR, "Unable to stop embedded Jetty  
server", e);
-        throw new UnableToCompleteException();
-      }
-
-      try {
          wac.start();
+        branch.log(TreeLogger.INFO, "Reload completed successfully");
        } catch (Exception e) {
-        branch.log(TreeLogger.ERROR, "Unable to start embedded Jetty  
server", e);
+        branch.log(TreeLogger.ERROR, "Unable to restart embedded Jetty  
server",
+            e);
          throw new UnableToCompleteException();
+      } finally {
+        // Reset the top-level logger.
+        Log.setLog(new JettyTreeLogger(logger));
        }
-
-      branch.log(TreeLogger.INFO, "Reload completed successfully");
      }

      public void stop() throws UnableToCompleteException {
        TreeLogger branch = logger.branch(TreeLogger.INFO,
            "Stopping Jetty server");
+      // Temporarily log Jetty on the branch.
+      Log.setLog(new JettyTreeLogger(branch));
        try {
          server.stop();
          server.setStopAtShutdown(false);
+        branch.log(TreeLogger.INFO, "Stopped successfully");
        } catch (Exception e) {
          branch.log(TreeLogger.ERROR, "Unable to stop embedded Jetty  
server", e);
          throw new UnableToCompleteException();
+      } finally {
+        // Reset the top-level logger.
+        Log.setLog(new JettyTreeLogger(logger));
        }
-      branch.log(TreeLogger.INFO, "Stopped successfully");
      }
    }

@@ -418,10 +422,13 @@

    public ServletContainer start(TreeLogger logger, int port, File  
appRootDir)
        throws Exception {
-    checkStartParams(logger, port, appRootDir);
+    TreeLogger branch = logger.branch(TreeLogger.INFO,
+        "Starting Jetty on port " + port, null);

-    // Setup our own logger.
-    Log.setLog(new JettyTreeLogger(logger));
+    checkStartParams(branch, port, appRootDir);
+
+    // Setup our branch logger during startup.
+    Log.setLog(new JettyTreeLogger(branch));

      // Turn off XML validation.
      System.setProperty("org.mortbay.xml.XmlParser.Validating", "false");
@@ -448,6 +455,9 @@
      server.setHandler(logHandler);
      server.start();
      server.setStopAtShutdown(true);
+
+    // Now that we're started, log to the top level logger.
+    Log.setLog(new JettyTreeLogger(logger));

      return new JettyServletContainer(logger, server, wac,
          connector.getLocalPort(), appRootDir);

--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---