Index: openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-init.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-init.tcl 13 Sep 2007 13:17:32 -0000 1.3 +++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-init.tcl 16 Sep 2007 11:15:15 -0000 1.4 @@ -23,30 +23,3 @@ ### this is probably not sufficient to do something useful... } -# Populate the counters -# Initialize from the old counters - -set logdir [parameter::get_from_package_key -package_key xotcl-request-monitor \ - -parameter log-dir \ - -default [file dirname [file root [ns_config ns/parameters ServerLog]]]] - -set max_urls [parameter::get_from_package_key -package_key "xotcl-request-monitor" -parameter max-url-stats -default 13] -set time_window [parameter::get_from_package_key -package_key "xotcl-request-monitor" -parameter "time-window" -default 13] - -set nr_trend_elements [parameter::get_from_package_key -package_key "xotcl-request-monitor" -parameter "trend-elements" -default 48] -incr nr_trend_elements - -# Create the file to load. This is per hour = 60*3 + 2 lines -set number_of_lines [expr 182 * $nr_trend_elements] -exec /usr/bin/tail -n $number_of_lines ${logdir}/counter.log >${logdir}/counter-new.log -set f [open $logdir/counter-new.log] - -while {-1 != [gets $f line]} { - regexp {(.*) -- (.*) ::(.*) (.*)} $line match timestamp server label value - set nr_stats_elements [parameter::get_from_package_key -package_key "xotcl-request-monitor" -parameter "max-stats-elements" -default 48] - throttle do $label lappend trend $value - set stats [throttle do $label lappend stats [list $timestamp $value]] - set stats [lrange [lsort -real -decreasing -index 1 $stats] 0 [expr {$nr_stats_elements - 1}]] - throttle do $label set stats $stats -} -