svn commit: r328962 - in /tcl/websh/trunk/src: generic/script.ws3 tests/log.test

[ro...@apache.org]

Author: ronnie
Date: Thu Oct 27 15:04:01 2005
New Revision: 328962

URL: http://svn.apache.org/viewcvs?rev=328962&view=rev
Log:
- moved cleanup from web::ap::perReqInit to web::ap::perReqCleanup
  to speed up request handling
- delete only log filters and destinations created during the request and
  not the ones created in web::initializer
- wrote a test for it

Modified:
    tcl/websh/trunk/src/generic/script.ws3
    tcl/websh/trunk/src/tests/log.test

Modified: tcl/websh/trunk/src/generic/script.ws3
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/generic/script.ws3?rev=328962&r1=328961&r2=328962&view=diff
==============================================================================
--- tcl/websh/trunk/src/generic/script.ws3 (original)
+++ tcl/websh/trunk/src/generic/script.ws3 Thu Oct 27 15:04:01 2005
@@ -128,19 +128,18 @@
 namespace eval web::ap {}
 
 proc web::ap::perReqInit {} {
+}
 
+proc web::ap::perReqCleanup {} {
+    # reset logging (except stuff from web::initializer)
+    web::logfilter delete -requests
+    web::logdest delete -requests
     # reset request data
     web::request -reset
     # reset response channels
     web::response -resetall
     # reset url data
     web::cmdurlcfg -reset
-}
-
-proc web::ap::perReqCleanup {} {
-
-    web::logdest delete
-    web::logfilter delete
 }
 
 #-----------------------------------------------------------------------------

Modified: tcl/websh/trunk/src/tests/log.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/log.test?rev=328962&r1=328961&r2=328962&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/log.test (original)
+++ tcl/websh/trunk/src/tests/log.test Thu Oct 27 15:04:01 2005
@@ -426,5 +426,34 @@
 logfilter1 *.alert-error
 logfilter2 *.alert-debug}}
 
+test log-5.1 {web::initializer logs} {
+
+    web::logfilter delete
+    web::logdest delete
+    set res {}
+    
+    web::logfilter add *.-debug
+    web::logdest add -maxchar 50 -format "\$m"  *.-debug command logTestCatchMsg
+    lappend res [web::logfilter names] [web::logdest names]
+
+    # since tests are in CGI mode, this is executed immediately
+    web::initializer {
+	web::logfilter add *.-debug
+	web::logdest add -maxchar 50 -format "\$m"  *.-debug command logTestCatchMsg
+    }
+    lappend res [web::logfilter names] [web::logdest names]
+
+    # this is supposed to delete all log filters and destinations not
+    # created in web::initializer
+    web::logfilter delete -requests
+    web::logdest delete -requests
+    lappend res [web::logfilter names] [web::logdest names]
+
+    web::logfilter delete
+    web::logdest delete
+    lappend res [web::logfilter names] [web::logdest names]
+
+} {logfilter0 logdest0 {logfilter0 logfilter1} {logdest0 logdest1} logfilter1 logdest1 {} {}}
+
 # cleanup
 ::tcltest::cleanupTests



---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org