You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2005/10/28 15:18:41 UTC
svn commit: r329197 - in /tcl/websh/trunk/src: generic/script.ws3
tests/dispatch.test tests/logtochannel.test tests/logtocmd.test
tests/logtofile.test tests/logtosyslog.test tests/time.test tests/webtest.ws3
Author: ronnie
Date: Fri Oct 28 06:18:26 2005
New Revision: 329197
URL: http://svn.apache.org/viewcvs?rev=329197&view=rev
Log:
- use new web::loglevel instead of web::logfilter, which is
now deprecated.
Modified:
tcl/websh/trunk/src/generic/script.ws3
tcl/websh/trunk/src/tests/dispatch.test
tcl/websh/trunk/src/tests/logtochannel.test
tcl/websh/trunk/src/tests/logtocmd.test
tcl/websh/trunk/src/tests/logtofile.test
tcl/websh/trunk/src/tests/logtosyslog.test
tcl/websh/trunk/src/tests/time.test
tcl/websh/trunk/src/tests/webtest.ws3
Modified: tcl/websh/trunk/src/generic/script.ws3
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/generic/script.ws3?rev=329197&r1=329196&r2=329197&view=diff
==============================================================================
--- tcl/websh/trunk/src/generic/script.ws3 (original)
+++ tcl/websh/trunk/src/generic/script.ws3 Fri Oct 28 06:18:26 2005
@@ -132,7 +132,7 @@
proc web::ap::perReqCleanup {} {
# reset logging (except stuff from web::initializer)
- web::logfilter delete -requests
+ web::loglevel delete -requests
web::logdest delete -requests
# reset request data
web::request -reset
Modified: tcl/websh/trunk/src/tests/dispatch.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/dispatch.test?rev=329197&r1=329196&r2=329197&view=diff
==============================================================================
Binary files /tmp/tmpclbdMV and /tmp/tmpaixt-M differ
Modified: tcl/websh/trunk/src/tests/logtochannel.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/logtochannel.test?rev=329197&r1=329196&r2=329197&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/logtochannel.test (original)
+++ tcl/websh/trunk/src/tests/logtochannel.test Fri Oct 28 06:18:26 2005
@@ -27,15 +27,15 @@
test logToChannel-1.1 {websh3_weblog: use file} {
set res "Failed"
- web::logfilter delete
+ web::loglevel delete
web::logdest delete
- web::logfilter add tochannel.alert-info
+ web::loglevel add tochannel.alert-info
set curTim [clock seconds]
set fileName "tochannel-[info hostname]-$curTim-[pid].dat"
set fileId [open $fileName "a"]
set res [web::logdest add tochannel.-debug channel -unbuffered $fileId]
web::log tochannel.info ">>> T E S T <<< $curTim"
- web::logfilter delete
+ web::loglevel delete
web::logdest delete
close $fileId
# and see if you find it in the file
Modified: tcl/websh/trunk/src/tests/logtocmd.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/logtocmd.test?rev=329197&r1=329196&r2=329197&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/logtocmd.test (original)
+++ tcl/websh/trunk/src/tests/logtocmd.test Fri Oct 28 06:18:26 2005
@@ -38,9 +38,9 @@
test logToCmd-1.2 {websh3_logToCmd: test log to command} {
web::logdest delete
- web::logfilter delete
+ web::loglevel delete
web::logdest add info2.-debug command testLogHandler
- web::logfilter add info2.-debug
+ web::loglevel add info2.-debug
set curTim [clock seconds]
set res [web::log info2.info $curTim]
} {testLogHandler -- T E S T -- ok}
Modified: tcl/websh/trunk/src/tests/logtofile.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/logtofile.test?rev=329197&r1=329196&r2=329197&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/logtofile.test (original)
+++ tcl/websh/trunk/src/tests/logtofile.test Fri Oct 28 06:18:26 2005
@@ -77,7 +77,7 @@
test logtofile-3.1 {web::log to file} {
web::logdest delete
web::logdest add info2.-debug file -unbuffered test.dat
- web::logfilter add *.-debug
+ web::loglevel add *.-debug
web::log info3.debug ""
web::readfile test.dat empty
web::log info2.debug "hi"
Modified: tcl/websh/trunk/src/tests/logtosyslog.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/logtosyslog.test?rev=329197&r1=329196&r2=329197&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/logtosyslog.test (original)
+++ tcl/websh/trunk/src/tests/logtosyslog.test Fri Oct 28 06:18:26 2005
@@ -60,9 +60,9 @@
set curTim [clock seconds]
web::logdest delete
- web::logfilter delete
+ web::loglevel delete
- web::logfilter add info.-debug
+ web::loglevel add info.-debug
web::logdest add \
-format "T E S T toSyslog -- %x %X \[$curTim\] \$f-\$l-\$m\n" \
info.-debug \
@@ -92,7 +92,7 @@
## clean up
web::logdest delete
- web::logfilter delete
+ web::loglevel delete
set res
} {Ok}
Modified: tcl/websh/trunk/src/tests/time.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/time.test?rev=329197&r1=329196&r2=329197&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/time.test (original)
+++ tcl/websh/trunk/src/tests/time.test Fri Oct 28 06:18:26 2005
@@ -121,22 +121,22 @@
test time-1.7 {log} {
web::logdest delete
- web::logfilter delete
+ web::loglevel delete
set fh [open [set fn [web::tempfile]] w]
- web::logfilter add a.-info
- web::logfilter add goo1.alert-warning
- web::logfilter add b.info-info
- web::logfilter add goo2.-debug
- web::logfilter add c.-debug
- web::logfilter add goo3.-debug
- web::logfilter add d.-debug
- web::logfilter add good.info-info
- web::logfilter add good.debug-debug
- web::logfilter add e.-debug
- web::logfilter add f.-debug
- web::logfilter add goo4.-debug
+ web::loglevel add a.-info
+ web::loglevel add goo1.alert-warning
+ web::loglevel add b.info-info
+ web::loglevel add goo2.-debug
+ web::loglevel add c.-debug
+ web::loglevel add goo3.-debug
+ web::loglevel add d.-debug
+ web::loglevel add good.info-info
+ web::loglevel add good.debug-debug
+ web::loglevel add e.-debug
+ web::loglevel add f.-debug
+ web::loglevel add goo4.-debug
web::logdest add a.-info channel $fh
web::logdest add goo1.alert-warning channel $fh
Modified: tcl/websh/trunk/src/tests/webtest.ws3
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/webtest.ws3?rev=329197&r1=329196&r2=329197&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/webtest.ws3 (original)
+++ tcl/websh/trunk/src/tests/webtest.ws3 Fri Oct 28 06:18:26 2005
@@ -48,7 +48,7 @@
# -----------------------------------------------------------------------------
# log to local file
# -----------------------------------------------------------------------------
-## web::logfilter add *.-debug
+## web::loglevel add *.-debug
## web::logdest add *.-debug channel stdout
## web::logdest add *.-debug file [file join . webtest.log]
## web::log websh3.debug {== tests started ==}
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org