cziegeler 01/08/08 02:55:42
Modified: src/org/apache/cocoon/servlet Tag: cocoon_20_branch
CocoonServlet.java
Added: src/org/apache/cocoon/util/log Tag: cocoon_20_branch
CocoonLogFormatter.java
ExtensiblePatternFormatter.java
Log:
Synced 2.0 with own logger from 2.1
Revision Changes Path
No revision
No revision
1.13.2.11 +14 -4 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.13.2.10
retrieving revision 1.13.2.11
diff -u -r1.13.2.10 -r1.13.2.11
--- CocoonServlet.java 2001/08/07 10:18:03 1.13.2.10
+++ CocoonServlet.java 2001/08/08 09:55:39 1.13.2.11
@@ -42,12 +42,13 @@
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.NetUtils;
+import org.apache.cocoon.util.log.CocoonLogFormatter;
+import org.apache.log.ContextStack;
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
import org.apache.log.Logger;
import org.apache.log.Priority;
import org.apache.log.filter.PriorityFilter;
-import org.apache.log.format.AvalonFormatter;
import org.apache.log.output.FileOutputLogTarget;
import org.apache.log.output.ServletOutputLogTarget;
import org.xml.sax.SAXException;
@@ -61,7 +62,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.13.2.10 $ $Date: 2001/08/07 10:18:03 $
+ * @version CVS $Revision: 1.13.2.11 $ $Date: 2001/08/08 09:55:39 $
*/
public class CocoonServlet extends HttpServlet {
@@ -334,9 +335,9 @@
this.appContext.put(Constants.CONTEXT_LOG_FILE, logName);
final String path = logDir + logName;
- final AvalonFormatter formatter = new AvalonFormatter();
+ final CocoonLogFormatter formatter = new CocoonLogFormatter();
formatter.setFormat( "%7.7{priority} %{time} [%8.8{category}] " +
- "(%{context}): %{message}\\n%{throwable}" );
+ "(%{uri}) %{thread}/%{class:short}:
%{message}\\n%{throwable}" );
this.log = Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon");
this.log.setPriority(logPriority);
@@ -485,6 +486,15 @@
}
Environment env = this.getEnvironment(uri, request, res);
+
+ // Initialize a fresh log context containing the object model : it
+ // will be used by the CocoonLogFormatter
+ ContextStack ctxStack = org.apache.log.ContextStack.getCurrentContext();
+ ctxStack.clear();
+ // Add thread name (default content for empty context)
+ ctxStack.push(Thread.currentThread().getName());
+ // Add the object model
+ ctxStack.push(env.getObjectModel());
if (!this.cocoon.process(env)) {
No revision
No revision
1.3.2.1 +1 -1
xml-cocoon2/src/org/apache/cocoon/util/log/CocoonLogFormatter.java
Index: CocoonLogFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/CocoonLogFormatter.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- CocoonLogFormatter.java 2001/08/07 15:07:02 1.3
+++ CocoonLogFormatter.java 2001/08/08 09:55:41 1.3.2.1
@@ -33,7 +33,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/07 15:07:02 $
+ * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/08/08 09:55:41 $
*/
public class CocoonLogFormatter extends ExtensiblePatternFormatter
1.3.2.1 +1 -1
xml-cocoon2/src/org/apache/cocoon/util/log/ExtensiblePatternFormatter.java
Index: ExtensiblePatternFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/ExtensiblePatternFormatter.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- ExtensiblePatternFormatter.java 2001/08/07 15:07:02 1.3
+++ ExtensiblePatternFormatter.java 2001/08/08 09:55:42 1.3.2.1
@@ -28,7 +28,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/07 15:07:02 $
+ * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/08/08 09:55:42 $
*/
public class ExtensiblePatternFormatter
implements Formatter
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
