You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/03/14 10:13:16 UTC
[1/2] git commit: Read the sessiondata only if requestdata is not
null. Append Character instead of a String when possible
Repository: wicket
Updated Branches:
refs/heads/5241-request-logger-duration [created] 1d9ef1107
Read the sessiondata only if requestdata is not null.
Append Character instead of a String when possible
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/de424fed
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/de424fed
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/de424fed
Branch: refs/heads/5241-request-logger-duration
Commit: de424fed2fbf5b4ce1b46b5abf466c3a0576d17f
Parents: 74e7107
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 14 11:04:51 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Mar 14 11:04:51 2014 +0200
----------------------------------------------------------------------
.../apache/wicket/protocol/http/AbstractRequestLogger.java | 2 +-
.../java/org/apache/wicket/protocol/http/RequestLogger.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/de424fed/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
index add5220..f6d18ed 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
@@ -315,10 +315,10 @@ public abstract class AbstractRequestLogger implements IRequestLogger
public void performLogging()
{
RequestData requestdata = RequestCycle.get().getMetaData(REQUEST_DATA);
- SessionData sessiondata = RequestCycle.get().getMetaData(SESSION_DATA);
if (requestdata != null)
{
// log the request- and sessiondata (the latter can be null)
+ SessionData sessiondata = RequestCycle.get().getMetaData(SESSION_DATA);
log(requestdata, sessiondata);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/de424fed/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
index e932645..864c162 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
@@ -67,21 +67,21 @@ public class RequestLogger extends AbstractRequestLogger
sb.append(rd.getTimeTaken());
sb.append(",url=\"");
sb.append(rd.getRequestedUrl());
- sb.append("\"");
+ sb.append('"');
sb.append(",event={");
sb.append(getRequestHandlerString(rd.getEventTarget()));
sb.append("},response={");
sb.append(getRequestHandlerString(rd.getResponseTarget()));
sb.append("},sessionid=\"");
sb.append(rd.getSessionId());
- sb.append("\"");
+ sb.append('"');
sb.append(",sessionsize=");
sb.append(rd.getSessionSize());
if (rd.getSessionInfo() != null && !Strings.isEmpty(rd.getSessionInfo().toString()))
{
sb.append(",sessioninfo={");
sb.append(rd.getSessionInfo());
- sb.append("}");
+ sb.append('}');
}
if (sd != null)
{
@@ -105,7 +105,7 @@ public class RequestLogger extends AbstractRequestLogger
sb.append(total);
sb.append("M,used=");
sb.append(used);
- sb.append("M");
+ sb.append('M');
return sb.toString();
}
[2/2] git commit: WICKET-5241 RequestLogger's server duration does
not include 'detach duration'
Posted by mg...@apache.org.
WICKET-5241 RequestLogger's server duration does not include 'detach duration'
Track the request logger's end time after all pages have been detached.
This way it shows the correct time fo the page rendering.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d9ef110
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d9ef110
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d9ef110
Branch: refs/heads/5241-request-logger-duration
Commit: 1d9ef1107958deb83f9f87a9e8be80d48b267ecf
Parents: de424fe
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 14 11:11:39 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Mar 14 11:11:39 2014 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Application.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d9ef110/wicket-core/src/main/java/org/apache/wicket/Application.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java
index a2bf907..2a08c2c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.java
@@ -1639,17 +1639,13 @@ public abstract class Application implements UnboundListener, IEventSink
{
Session.get().getPageManager().commitRequest();
}
- }
- @Override
- public void onEndRequest(RequestCycle cycle)
- {
if (Application.exists())
{
IRequestLogger requestLogger = Application.get().getRequestLogger();
if (requestLogger != null)
{
- requestLogger.requestTime((System.currentTimeMillis() - cycle.getStartTime()));
+ requestLogger.requestTime((System.currentTimeMillis() - requestCycle.getStartTime()));
}
}
}