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 -N -r1.16 -r1.17 --- openacs-4/packages/xotcl-request-monitor/www/index.tcl 22 Apr 2010 04:39:19 -0000 1.16 +++ openacs-4/packages/xotcl-request-monitor/www/index.tcl 15 Jun 2010 07:42:01 -0000 1.17 @@ -37,13 +37,12 @@ # if {[catch {return [exec "/usr/bin/uptime"]}]} { # return "" # } - set threads "- threads: [ns_server threads]" set procloadavg /proc/loadavg if {[file readable $procloadavg]} { set f [open $procloadavg]; set c [read $f]; close $f - return "$c $threads" + return $c } - return "[exec /usr/bin/uptime] $threads" + return [exec /usr/bin/uptime] } # collect current response time (per minute and hour) @@ -247,6 +246,8 @@ set current_response [join [currentResponseTime] " "] set current_load [currentSystemLoad] +array set current_threads [ns_server threads] + set running_requests [throttle running] set running [expr {[llength $running_requests]/2}] if {![catch {ns_conn contentsentlength}]} {