Index: openacs-4/packages/xotcl-request-monitor/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xotcl-request-monitor/www/index.adp	20 Apr 2010 09:11:01 -0000	1.4
+++ openacs-4/packages/xotcl-request-monitor/www/index.adp	15 Jun 2010 07:42:01 -0000	1.5
@@ -18,8 +18,12 @@
   <tr><td><b>Current System Activity:</b></td><td>@current_system_activity@</td></tr>
   <tr><td><b>Current System Load:</b></td><td>@current_load@</td></tr>
   <tr><td><b>Current Avg Response Time/sec:</b></td><td>@current_response@</td></tr>
-  <tr><td colspan="2">@running@ <a href='running'>Request(s)</a>
-  currently running, Avg busy @thread_avgs.busy@ current @thread_avgs.current@, <a href='stat-details'>Aggregated URL</a> Statistics,
+  <tr><td><b>Threads:</b></td><td>@running@ <a href='running'>Request(s)</a>
+  currently running,  
+  #connection threads @current_threads.current@ idle @current_threads.idle@,
+  min @current_threads.min@ max @current_threads.max@
+  <br>avg. #connection threads @thread_avgs.current@, avg. busy @thread_avgs.busy@</td></tr>
+  <tr><td><b>Summaries:</b></td><td><a href='stat-details'>Aggregated URL</a> Statistics,
   <a href='last100'>Last 100</a> Requests,
   <a href='throttle-statistics'>Throttle</a> Statistics
 </td><td><div style="font-size: 80%">
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.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}]} {