Attachment "logger.diffs" to
ticket [1599978fff]
added by
hemanglavana
2007-02-05 00:02:29.
Index: logger.man
===================================================================
RCS file: /cvsroot/tcllib/tcllib/modules/log/logger.man,v
retrieving revision 1.18
diff -u -r1.18 logger.man
--- logger.man 18 Aug 2006 15:03:34 -0000 1.18
+++ logger.man 4 Feb 2007 16:55:53 -0000
@@ -85,7 +85,7 @@
Globally enables logging at and "above" the given level. Levels are
[const debug], [const info], [const notice], [const warn], [const error],
-[const critical].
+[const critical], [const alert], [const emergency].
[call [cmd logger::disable] [arg level]]
@@ -112,6 +112,8 @@
[call [cmd \${log}::warn] [arg message]]
[call [cmd \${log}::error] [arg message]]
[call [cmd \${log}::critical] [arg message]]
+[call [cmd \${log}::alert] [arg message]]
+[call [cmd \${log}::emergency] [arg message]]
These are the commands called to actually log a message about an
event. [var \${log}] is the variable obtained from [cmd logger::init].
@@ -133,7 +135,7 @@
Disable logging, in the service referenced by [var \${log}], and its
children, at and below the level specified. Note that this does [emph not] enable logging above this level,
so you should probably use [cmd setlevel] instead.
-Disabling the loglevel [const critical] switches logging off for the service and its children.
+Disabling the loglevel [const emergency] switches logging off for the service and its children.
[call [cmd \${log}::lvlchangeproc] [arg command]]
[call [cmd \${log}::lvlchangeproc]]
Index: logger.tcl
===================================================================
RCS file: /cvsroot/tcllib/tcllib/modules/log/logger.tcl,v
retrieving revision 1.29
diff -u -r1.29 logger.tcl
--- logger.tcl 18 Aug 2006 15:03:34 -0000 1.29
+++ logger.tcl 4 Feb 2007 16:55:53 -0000
@@ -24,7 +24,7 @@
variable services {}
# The log 'levels'.
- variable levels [list debug info notice warn error critical]
+ variable levels [list debug info notice warn error critical alert emergency]
# The default global log level used for new logging services
variable enabled "debug"
Index: logger.test
===================================================================
RCS file: /cvsroot/tcllib/tcllib/modules/log/logger.test,v
retrieving revision 1.28
diff -u -r1.28 logger.test
--- logger.test 9 Oct 2006 21:41:41 -0000 1.28
+++ logger.test 4 Feb 2007 16:55:54 -0000
@@ -209,7 +209,7 @@
catch { ${log}::enable badargs } err
${log}::delete
set err
-} {Invalid level 'badargs' - levels are debug info notice warn error critical}
+} {Invalid level 'badargs' - levels are debug info notice warn error critical alert emergency}
test logger-4.5 {test method inheritance} {
set log1 [logger::init global]
@@ -228,7 +228,7 @@
catch { ${log}::disable badargs } err
${log}::delete
set err
-} {Invalid level 'badargs' - levels are debug info notice warn error critical}
+} {Invalid level 'badargs' - levels are debug info notice warn error critical alert emergency}
test logger-5.0 {setlevel command} {
set ::INFO ""
@@ -255,7 +255,7 @@
set code [catch {${log}::setlevel badargs} msg]
${log}::delete
list $code $msg
-} {1 {Invalid level 'badargs' - levels are debug info notice warn error critical}}
+} {1 {Invalid level 'badargs' - levels are debug info notice warn error critical alert emergency}}
test logger-5.2 {setlevel, with children} {
set log1 [logger::init global]
@@ -298,11 +298,11 @@
test logger-5.5 {global setlevel with wrong level} {
catch {logger::setlevel badargs} msg
set msg
-} {Invalid level 'badargs' - levels are debug info notice warn error critical}
+} {Invalid level 'badargs' - levels are debug info notice warn error critical alert emergency}
test logger-6.0 {levels command} {
logger::levels
-} {debug info notice warn error critical}
+} {debug info notice warn error critical alert emergency}
test logger-7.0 {currentloglevel} {
set log [logger::init global]
@@ -312,11 +312,11 @@
}
${log}::delete
set result
-} {debug info notice warn error critical}
+} {debug info notice warn error critical alert emergency}
test logger-7.1 {currentloglevel, disable all} {
set log [logger::init global]
- ${log}::disable critical
+ ${log}::disable emergency
set result [${log}::currentloglevel]
${log}::delete
set result
@@ -351,7 +351,7 @@
set log [logger::init global]
${log}::enable debug
lappend results [${log}::currentloglevel]
- ${log}::disable critical
+ ${log}::disable emergency
lappend results [${log}::currentloglevel]
${log}::disable debug
lappend results [${log}::currentloglevel]
@@ -366,7 +366,7 @@
lappend results [${log}::currentloglevel]
${log}::disable debug
lappend results [${log}::currentloglevel]
- ${log}::disable critical
+ ${log}::disable emergency
lappend results [${log}::currentloglevel]
${log}::delete
set results
@@ -605,9 +605,9 @@
${log}::delete
list $retval $::cmds
-} {{{LOGGED: Out} {LOGGED: In} {LOGGED: Out}} {::foo::critical\
+} {{{LOGGED: Out} {LOGGED: In} {LOGGED: Out}} {::foo::alert ::foo::critical\
::foo::currentloglevel ::foo::debug ::foo::delete ::foo::delproc\
- ::foo::disable ::foo::enable ::foo::error ::foo::info\
+ ::foo::disable ::foo::emergency ::foo::enable ::foo::error ::foo::info\
::foo::logproc ::foo::notice ::foo::servicename ::foo::services\
::foo::setlevel ::foo::trace ::foo::warn}}
@@ -634,9 +634,9 @@
list $retval $::cmds
-} {{{LOGGED: Out} {LOGGED: In} {LOGGED: Out}} {::bar::critical\
+} {{{LOGGED: Out} {LOGGED: In} {LOGGED: Out}} {::bar::alert ::bar::critical\
::bar::currentloglevel ::bar::debug ::bar::delete ::bar::delproc\
- ::bar::disable ::bar::enable ::bar::error ::bar::info\
+ ::bar::disable ::bar::emergency ::bar::enable ::bar::error ::bar::info\
::bar::logproc ::bar::notice ::bar::servicename ::bar::services\
::bar::setlevel ::bar::trace ::bar::warn}}
@@ -707,10 +707,12 @@
list $retval $::cmds
-} {{{LOGGED: Out} {LOGGED: In} {LOGGED: Out}} {::foo::bar::critical\
- ::foo::bar::currentloglevel ::foo::bar::debug ::foo::bar::delete ::foo::bar::delproc\
- ::foo::bar::disable ::foo::bar::enable ::foo::bar::error ::foo::bar::info\
- ::foo::bar::logproc ::foo::bar::notice ::foo::bar::servicename ::foo::bar::services\
+} {{{LOGGED: Out} {LOGGED: In} {LOGGED: Out}} {::foo::bar::alert\
+ ::foo::bar::critical ::foo::bar::currentloglevel ::foo::bar::debug\
+ ::foo::bar::delete ::foo::bar::delproc ::foo::bar::disable\
+ ::foo::bar::emergency ::foo::bar::enable ::foo::bar::error\
+ ::foo::bar::info ::foo::bar::logproc ::foo::bar::notice\
+ ::foo::bar::servicename ::foo::bar::services\
::foo::bar::setlevel ::foo::bar::trace ::foo::bar::warn}}
test logger-12.9 {import subcommand, errors} {
@@ -1059,6 +1061,7 @@
namespace delete ::logtest
set changes
} [list {debug info} {info notice} {notice warn} {warn error} {error critical} \
+ {critical alert} {alert emergency} {emergency alert} {alert critical} \
{critical error} {error warn} {warn notice} {notice info} {info debug}]
test logger-15.3 {test for logger levelchange callbacks} {
@@ -1086,6 +1089,7 @@
namespace delete ::logtest
set changes
} [list {debug info} {info notice} {notice warn} {warn error} {error critical} \
+ {critical alert} {alert emergency} {emergency alert} {alert critical} \
{critical error} {error warn} {warn notice} {notice info} {info debug}]
test logger-15.4 {test for logger with empty levelchange callback} {
Index: loggerAppender.tcl
===================================================================
RCS file: /cvsroot/tcllib/tcllib/modules/log/loggerAppender.tcl,v
retrieving revision 1.3
diff -u -r1.3 loggerAppender.tcl
--- loggerAppender.tcl 18 Aug 2006 15:03:34 -0000 1.3
+++ loggerAppender.tcl 4 Feb 2007 16:55:54 -0000
@@ -59,12 +59,14 @@
variable levelToColor
array set levelToColor {
- debug cyan
- info blue
- notice black
- warn red
- error red
- critical red-bold
+ debug cyan
+ info blue
+ notice black
+ warn red
+ error red
+ critical red-bold
+ alert red-bold
+ emergency red-bold
}
}
