From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 20 May 2015 13:21:05 +0000 (+0000)
Subject: Improve logging.
X-Git-Tag: argeo-commons-2.1.30~239
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=24c63057592c8ef8a161f3f37bbdafd0cd475dd5;p=lgpl%2Fargeo-commons.git

Improve logging.

git-svn-id: https://svn.argeo.org/commons/trunk@8121 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
index 02e08f2af..00db13443 100644
--- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
+++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
@@ -67,8 +67,8 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
 			new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, subject)
 					.login();
 		} catch (LoginException e) {
-			if (log.isTraceEnabled())
-				log.trace("Cannot authenticate user", e);
+			// if (log.isTraceEnabled())
+			// log.trace("Cannot authenticate user", e);
 			try {
 				new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS,
 						subject).login();
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
index 9d0bac5dc..7739670f1 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
@@ -76,8 +76,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 		try {
 			httpService.registerFilter("/", rootFilter, null, null);
 		} catch (Exception e) {
-			throw new CmsException(
-					"Could not register root filter", e);
+			throw new CmsException("Could not register root filter", e);
 		}
 	}
 
@@ -136,11 +135,11 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 		httpService.registerServlet(path, (Servlet) remotingServlet, ip, null);
 	}
 
-//	private Boolean isSessionAuthenticated(HttpSession httpSession) {
-//		SecurityContext contextFromSession = (SecurityContext) httpSession
-//				.getAttribute(SPRING_SECURITY_CONTEXT_KEY);
-//		return contextFromSession != null;
-//	}
+	// private Boolean isSessionAuthenticated(HttpSession httpSession) {
+	// SecurityContext contextFromSession = (SecurityContext) httpSession
+	// .getAttribute(SPRING_SECURITY_CONTEXT_KEY);
+	// return contextFromSession != null;
+	// }
 
 	private void requestBasicAuth(HttpSession httpSession,
 			HttpServletResponse response) {
@@ -189,8 +188,12 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 		public void doFilter(HttpSession httpSession,
 				HttpServletRequest request, HttpServletResponse response,
 				FilterChain filterChain) throws IOException, ServletException {
-			if (log.isTraceEnabled())
-				logRequest(request);
+			if (log.isTraceEnabled()) {
+				log.trace(request.getRequestURL().append(
+						request.getQueryString() != null ? "?"
+								+ request.getQueryString() : ""));
+				// logRequest(request);
+			}
 
 			String servletPath = request.getServletPath();
 
@@ -220,7 +223,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 			int pathLength = path.length();
 			if (pathLength != 0 && (path.charAt(0) == '/')
 					&& !servletPath.endsWith("rwt-resources")
-					&& path.lastIndexOf('/')!=0) {
+					&& path.lastIndexOf('/') != 0) {
 				String newLocation = request.getServletPath() + "#" + path;
 				response.setHeader("Location", newLocation);
 				response.setStatus(HttpServletResponse.SC_FOUND);
@@ -276,10 +279,10 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 				FilterChain filterChain) throws IOException, ServletException {
 
 			// Authenticate from session
-//			if (isSessionAuthenticated(httpSession)) {
-//				filterChain.doFilter(request, response);
-//				return;
-//			}
+			// if (isSessionAuthenticated(httpSession)) {
+			// filterChain.doFilter(request, response);
+			// return;
+			// }
 
 			KernelUtils.anonymousLogin(authenticationManager);
 			filterChain.doFilter(request, response);
@@ -306,9 +309,9 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 				UsernamePasswordAuthenticationToken token = basicAuth(basicAuth);
 				Authentication auth = authenticationManager.authenticate(token);
 				SecurityContextHolder.getContext().setAuthentication(auth);
-//				httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY,
-//						SecurityContextHolder.getContext());
-//				httpSession.setAttribute(ATTR_AUTH, Boolean.FALSE);
+				// httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY,
+				// SecurityContextHolder.getContext());
+				// httpSession.setAttribute(ATTR_AUTH, Boolean.FALSE);
 				filterChain.doFilter(request, response);
 				return;
 			}
diff --git a/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java b/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java
index 4b871cbcf..7835b7efa 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java
@@ -5,6 +5,8 @@ import java.util.Map;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.AbstractCmsEntryPoint;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.CmsImageManager;
@@ -20,6 +22,8 @@ import org.eclipse.swt.widgets.Control;
 
 /** Simple header/body ergonomics. */
 public class SimpleErgonomics extends AbstractCmsEntryPoint {
+	private final static Log log = LogFactory.getLog(SimpleErgonomics.class);
+
 	private Composite headerArea;
 	private Composite bodyArea;
 	private final CmsUiProvider uiProvider;
@@ -59,6 +63,8 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 	protected void refresh() {
 		refreshHeader();
 		refreshBody();
+		if (log.isTraceEnabled())
+			log.trace("UI refreshed " + getNode());
 	}
 
 	protected void refreshHeader() {