Index: openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl,v diff -u -r1.36 -r1.37 --- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 9 May 2010 02:40:26 -0000 1.36 +++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 10 Feb 2011 16:37:22 -0000 1.37 @@ -134,9 +134,8 @@ Throttle instproc server_threads {} {ns_server threads} } else { Throttle instproc server_threads {} { - set l [list] - foreach e [ns_server threads] {lappend l [lindex $e 0] [lindex $e 1]} - return $l + # flatten the list + return [eval concat [ns_server threads]] } } Throttle instproc update_threads_state {} { @@ -1118,6 +1117,7 @@ throttle forward off %self do throttler set off 1 throttle forward on %self do throttler set off 0 throttle forward running %self do throttler %proc +throttle forward server_threads %self do throttler %proc throttle forward nr_running %self do throttler array size running_url throttle forward trend %self do %1 set trend throttle forward max_values %self do %1 set stats Index: openacs-4/packages/xotcl-request-monitor/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/index.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/xotcl-request-monitor/www/index.tcl 15 Jun 2010 07:42:01 -0000 1.17 +++ openacs-4/packages/xotcl-request-monitor/www/index.tcl 10 Feb 2011 16:37:22 -0000 1.18 @@ -246,7 +246,7 @@ set current_response [join [currentResponseTime] " "] set current_load [currentSystemLoad] -array set current_threads [ns_server threads] +array set current_threads [throttle server_threads] set running_requests [throttle running] set running [expr {[llength $running_requests]/2}]