Index: openacs-4/packages/xotcl-request-monitor/www/running.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/running.tcl,v diff -u -r1.10.2.5 -r1.10.2.6 --- openacs-4/packages/xotcl-request-monitor/www/running.tcl 22 Dec 2022 02:51:37 -0000 1.10.2.5 +++ openacs-4/packages/xotcl-request-monitor/www/running.tcl 30 May 2023 10:01:46 -0000 1.10.2.6 @@ -50,20 +50,20 @@ set sortable_requests [list] foreach {key elapsed} $running_requests { - lassign [split $key ,] requestor url + lassign [split $key ,] requester url set ms [format %.2f [expr {[throttle ms -start_time $elapsed]/1000.0}]] - set user_info [xo::request_monitor_user_info $requestor] + set user_info [xo::request_monitor_user_info $requester] set user_string [dict get $user_info label] - set user_url "last-requests?request_key=$requestor" + set user_url "last-requests?request_key=$requester" lappend sortable_requests [list $user_string $user_url $url $ms ""] } foreach {index entry} $background_requests { lassign $entry key elapsed - lassign [split $key ,] requestor url + lassign [split $key ,] requester url set ms [format %.2f [expr {[throttle ms -start_time $elapsed]/-1000.0}]] - set user_info [xo::request_monitor_user_info $requestor] + set user_info [xo::request_monitor_user_info $requester] set user_string [dict get $user_info label] - set user_url "last-requests?request_key=$requestor" + set user_url "last-requests?request_key=$requester" lappend sortable_requests [list $user_string $user_url $url $ms "::bgdelivery"] } if {[ns_info name] eq "NaviServer"} { @@ -84,17 +84,17 @@ ns_log notice "ns_writer list returns unknown number ([llength $entry]) of elements" continue } - lassign $clientdata requestor url + lassign $clientdata requester url set size [expr {$remaining+$done}] set percentage [expr {$done*100.0/$size}] set progress [format {%5.2f%% of %5.2f MB} $percentage [expr {$size/1000000.0}]] set ms [format %.2f [expr {([clock milliseconds] - $starttime*1000)/-1000.0}]] - if {[nsf::is integer $requestor]} { - set user_string [person::name -person_id $requestor] + if {[nsf::is integer $requester]} { + set user_string [person::name -person_id $requester] } else { - set user_string $requestor + set user_string $requester } - set user_url "last-requests?request_key=$requestor" + set user_url "last-requests?request_key=$requester" lappend sortable_requests [list $user_string $user_url $url $ms $thread $progress] } }