Better identification of parsed data seperate_reporter_and_logger_root
authorjtulach@netbeans.org
Thu, 14 Jun 2007 17:36:17 +0000
changeset 23080708fe89c0c6
parent 2307 ee50f96fa043
child 2309 3e5d3fd5c269
Better identification of parsed data
logger/uihandlerserver/src/java/org/netbeans/server/uihandler/LogsManager.java
logger/uihandlerserver/web/initializing.jsp
     1.1 --- a/logger/uihandlerserver/src/java/org/netbeans/server/uihandler/LogsManager.java	Thu Jun 14 17:21:59 2007 +0000
     1.2 +++ b/logger/uihandlerserver/src/java/org/netbeans/server/uihandler/LogsManager.java	Thu Jun 14 17:36:17 2007 +0000
     1.3 @@ -150,6 +150,7 @@
     1.4              }
     1.5          }
     1.6          
     1.7 +        this.initCounts = Collections.nCopies(2, getNumberOfLogs());
     1.8          sessions = s;
     1.9          
    1.10          LOG.log(Level.INFO, "Sessions created for {0}", dir);
     2.1 --- a/logger/uihandlerserver/web/initializing.jsp	Thu Jun 14 17:21:59 2007 +0000
     2.2 +++ b/logger/uihandlerserver/web/initializing.jsp	Thu Jun 14 17:36:17 2007 +0000
     2.3 @@ -14,7 +14,15 @@
     2.4  <head>
     2.5          <meta 
     2.6              http-equiv="Refresh" 
     2.7 -            content="30; URL=<% out.print(HttpUtils.getRequestURL(request)); %>"
     2.8 +            content="30; URL=<% 
     2.9 +                int logs = LogsManager.getDefault().getNumberOfLogs();
    2.10 +                int parsed = LogsManager.getDefault().getParsedLogs();
    2.11 +                if (parsed < logs) {    
    2.12 +                    out.print(HttpUtils.getRequestURL(request)); 
    2.13 +                } else {
    2.14 +                    out.print(new URL(HttpUtils.getRequestURL(request), "..")); 
    2.15 +                }
    2.16 +            %>"
    2.17          >
    2.18      
    2.19  </head>
    2.20 @@ -24,14 +32,13 @@
    2.21          <h1>Still initializing</h1>
    2.22          
    2.23          <p>
    2.24 -        Parsed <% out.print(LogsManager.getDefault().getParsedLogs()); %> 
    2.25 -        from <% out.print(LogsManager.getDefault().getNumberOfLogs()); %>
    2.26 +        Parsed <% out.print(parsed); %> 
    2.27 +        from <% out.print(logs); %> log files.
    2.28          </p>
    2.29      
    2.30          <% LinkedHashMap<String,Integer> data = new LinkedHashMap<String,Integer>(); %>
    2.31 -        <% int parsed = LogsManager.getDefault().getParsedLogs(); %>
    2.32          <% data.put("Parsed", parsed); %>
    2.33 -        <% data.put("Unparsed", LogsManager.getDefault().getNumberOfLogs() - parsed); %>
    2.34 +        <% data.put("Remaining", logs - parsed); %>
    2.35          <% pageContext.setAttribute("parsed", data.entrySet()); %>
    2.36      
    2.37          <chart:pie collection="parsed" category="key" value="value" />