dims 01/09/06 10:37:43
Modified: src/org/apache/cocoon/servlet Tag: cocoon_20_branch
CocoonServlet.java
Log:
dumps stuff onto stdout when logkit.xconf is missing.
Revision Changes Path
No revision
No revision
1.13.2.22 +18 -16 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.21
retrieving revision 1.13.2.22
diff -u -r1.13.2.21 -r1.13.2.22
--- CocoonServlet.java 2001/09/05 22:18:14 1.13.2.21
+++ CocoonServlet.java 2001/09/06 17:37:43 1.13.2.22
@@ -67,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Revision: 1.13.2.21 $ $Date: 2001/09/05 22:18:14 $
+ * @version CVS $Revision: 1.13.2.22 $ $Date: 2001/09/06 17:37:43 $
*/
public class CocoonServlet extends HttpServlet {
@@ -358,33 +358,35 @@
Hierarchy.getDefaultHierarchy().setDefaultLogTarget(servTarget);
Hierarchy.getDefaultHierarchy().setDefaultPriority(logPriority);
final Logger logger = Hierarchy.getDefaultHierarchy().getLoggerFor("");
+ final DefaultLogKitManager logKitManager = new DefaultLogKitManager();
+ logKitManager.setLogger(logger);
+ final DefaultContext subcontext = new DefaultContext(this.appContext);
+ subcontext.put("servlet-context", this.servletContext);
+ subcontext.put("context-root", this.servletContext.getRealPath("/"));
try {
- final String logkitConfig = getInitParameter("logkit-config");
-
+ logKitManager.contextualize(subcontext);
+ this.logKitManager = logKitManager;
+
//Configure the logkit management
+ final String logkitConfig = getInitParameter("logkit-config");
if (logkitConfig != null) {
final FileInputStream fis = new
FileInputStream(this.servletContext.getRealPath("/") + logkitConfig);
final DefaultConfigurationBuilder builder = new
DefaultConfigurationBuilder();
final Configuration conf = builder.build(fis);
- final DefaultLogKitManager logKitManager = new
DefaultLogKitManager();
- logKitManager.setLogger(logger);
- final DefaultContext subcontext = new
DefaultContext(this.appContext);
- subcontext.put("servlet-context", this.servletContext);
- subcontext.put("context-root",
this.servletContext.getRealPath("/"));
- logKitManager.contextualize(subcontext);
logKitManager.configure(conf);
- this.logKitManager = logKitManager;
- final String cocoonLogger = getInitParameter("servlet-logger");
- if (cocoonLogger != null) {
- this.log = logKitManager.getLogger(cocoonLogger);
- } else {
- this.log = logKitManager.getLogger("cocoon");
- }
}
} catch (Exception e) {
Hierarchy.getDefaultHierarchy().log("Could not set up Cocoon Logger,
will use screen instead", e);
}
+
+ final String cocoonLogger = getInitParameter("servlet-logger");
+ if (cocoonLogger != null) {
+ this.log = logKitManager.getLogger(cocoonLogger);
+ } else {
+ this.log = logKitManager.getLogger("cocoon");
+ }
+
}
/**
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
