Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug
In directory james.mmbase.org:/tmp/cvs-serv28647/debug
Modified Files:
LogTag.java
Log Message:
MMB-1693.
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug
See also: http://www.mmbase.org/jira/browse/MMB-1693
Index: LogTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/debug/LogTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- LogTag.java 30 Aug 2006 18:02:16 -0000 1.15
+++ LogTag.java 24 Jul 2008 11:29:20 -0000 1.16
@@ -11,16 +11,16 @@
import javax.servlet.jsp.*;
import org.mmbase.bridge.jsp.taglib.ContextReferrerTag;
+import org.mmbase.bridge.jsp.taglib.util.Attribute;
import javax.servlet.http.HttpServletRequest;
-import org.mmbase.util.logging.Logger;
-import org.mmbase.util.logging.Logging;
+import org.mmbase.util.logging.*;
/**
* The implementation of the log tag.
*
* @author Michiel Meeuwissen
- * @version $Id: LogTag.java,v 1.15 2006/08/30 18:02:16 michiel Exp $
+ * @version $Id: LogTag.java,v 1.16 2008/07/24 11:29:20 michiel Exp $
*/
public class LogTag extends ContextReferrerTag {
@@ -31,6 +31,8 @@
public final static String LOGTAG_CATEGORY = Logging.PAGE_CATEGORY +
".LOGTAG"; // pages themselfs log to subcategories of this.
private String jspvar;
+
+ private Attribute level = Attribute.NULL;
/**
* JspVar to Create, and write to
*/
@@ -38,9 +40,20 @@
jspvar = j;
}
+ /**
+ [EMAIL PROTECTED] MMBase-1.9
+ */
+ public void setLevel(String l) throws JspTagException {
+ level = getAttribute(l, true);
+ }
+
+ private Level getLevel() throws JspTagException {
+ return level == Attribute.NULL ? Level.SERVICE :
Level.toLevel(level.getString(this));
+ }
+
public void setPageContext(PageContext pc) {
- /* Determin only once per page if it can log */
+ /* Determin logger only once per page */
super.setPageContext(pc);
log = (Logger) pageContext.getAttribute("__logtag_logger");
if(log == null) {
@@ -48,7 +61,6 @@
counter = 0;
pageContext.setAttribute("__logtag_logger", log);
}
- doLog = log.isServiceEnabled();
}
@@ -65,7 +77,7 @@
public int doEndTag() throws JspTagException {
if (doLog && jspvar == null) {
- log.service(counter++ + ": " + (bodyContent != null ?
bodyContent.getString() : "-"));
+ Logging.log(getLevel(), log, counter++ + ": " + (bodyContent !=
null ? bodyContent.getString() : "-"));
}
if (jspvar != null && EVAL_BODY == EVAL_BODY_BUFFERED) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
