Index: openacs-4/packages/monitoring/monitoring.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/monitoring/monitoring.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/monitoring/monitoring.info	19 Aug 2002 23:10:28 -0000	1.3
+++ openacs-4/packages/monitoring/monitoring.info	22 Aug 2002 03:36:15 -0000	1.4
@@ -86,7 +86,7 @@
             <file type="content_page" path="www/watchdog/index.tcl"/>
         </files>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TopOptions"  default="-b -n 1" description="Options to use with top on your OS" section_name="monitoring"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TopOptions"  default="-bn 1" description="Options to use with top on your OS" section_name="monitoring"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PersontoNotify"  description="Person to notify about watchdog (default to system owner if blank)" section_name="monitoring"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="WatchDogFrequency"  default="300" description="Frequency to run watchdog in minutes." section_name="monitoring"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="WatchDogParser"  description="Program to parse errors for watchdog (leave blank to use default program)" section_name="monitoring"/>
Index: openacs-4/packages/monitoring/tcl/monitoring-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/monitoring/tcl/monitoring-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/monitoring/tcl/monitoring-procs.tcl	19 Aug 2002 23:10:28 -0000	1.2
+++ openacs-4/packages/monitoring/tcl/monitoring-procs.tcl	22 Aug 2002 03:36:15 -0000	1.3
@@ -56,8 +56,8 @@
     set proc_var_list [list pid username threads priority nice proc_size \
                        resident_memory state cpu_total_time cpu_pct command]
     # location of the desired top function
-    set top_location [ad_parameter -package_id [monitoring_pkg_id] TopLocation monitoring]
-    set top_options [ad_parameter -package_id [monitoring_pkg_id] TopOptions monitoring]
+    set top_location [ad_parameter -package_id [monitoring_pkg_id] TopLocation monitoring "/usr/local/bin/top"]
+    set top_options [ad_parameter -package_id [monitoring_pkg_id] TopOptions monitoring "-bn 1"]
     
     # make sure we have a path to top and that the file exists
     if { [empty_string_p $top_location] } {
@@ -68,9 +68,7 @@
         return
     }
 
-    set top_command "exec $top_location $top_options"
-
-    if [catch { set top_output [eval $top_command] } errmsg] {
+    if [catch { set top_output [exec $top_location $top_options] } errmsg] {
         # couldn't exec top at TopLocation
         if { ![file exists $top_location] } {
             ns_log Error "ad_monitor_top: top not found $top_location: $errmsg"
Index: openacs-4/packages/monitoring/www/top/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/monitoring/www/top/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/monitoring/www/top/index.tcl	19 Aug 2002 23:10:29 -0000	1.2
+++ openacs-4/packages/monitoring/www/top/index.tcl	22 Aug 2002 03:36:15 -0000	1.3
@@ -185,9 +185,10 @@
 "
 
 set top_location [ad_parameter -package_id [monitoring_pkg_id] TopLocation monitoring "/usr/local/bin/top"]
+set top_options [ad_parameter -package_id [monitoring_pkg_id] TopOptions monitoring "-bn 1"]
 
 if { [string match $showtop "t"] } {
-    if [catch { set top_output [exec $top_location] } errmsg] {
+    if [catch { set top_output [exec $top_location $top_options] } errmsg] {
         # couldn't exec top at TopLocation
         if { ![file exists $top_location] } {
         ad_return_error "top not found" "