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.43.2.6 -r1.43.2.7 --- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 28 Nov 2016 08:20:17 -0000 1.43.2.6 +++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 30 Nov 2016 08:16:17 -0000 1.43.2.7 @@ -274,7 +274,7 @@ } Throttle instproc add_url_stat {method url partialtimes key pa content_type} { - #ns_log notice "Throttle.add_url_stat($method,$url,$time_used,$key,$pa,$content_type)" + #ns_log notice "Throttle.add_url_stat($method,$url,$partialtimes,$key,$pa,$content_type)" catch {my unset running_url($key,$url)} #my log "### unset running_url($key,$url) $errmsg" if {[string match "text/html*" $content_type]} { @@ -326,12 +326,12 @@ #set conntime [expr {int(([dict get $partialtimes runtime] + [dict get $partialtimes filtertime]) * 1000)}] set totaltime [dict get $partialtimes ms] - #ns_log notice "url=<$url> time_used $time_used" + #ns_log notice "url=<$url> totaltime $totaltime" if { $url in {/register/ / /dotlrn/} } { # # calculate for certain URLs separate statistics # - incr ::agg_time($url) $time_used + incr ::agg_time($url) $totaltime incr ::count(calls:$url) } if {$totaltime > 5000} { @@ -1419,6 +1419,12 @@ return $d } } +throttle proc ms {-start_time} { + if {![info exists start_time]} {set start_time [ns_conn start]} + set t [ns_time diff [ns_time get] $start_time] + set ms [expr {[ns_time seconds $t]*1000 + [ns_time microseconds $t]/1000}] + return $ms +} throttle proc get_context {} { #my log "--t [my exists context_initialized] url=[ns_conn url]" Index: openacs-4/packages/xotcl-request-monitor/www/last100.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last100.tcl,v diff -u -r1.7.2.2 -r1.7.2.3 --- openacs-4/packages/xotcl-request-monitor/www/last100.tcl 26 Apr 2016 07:25:29 -0000 1.7.2.2 +++ openacs-4/packages/xotcl-request-monitor/www/last100.tcl 30 Nov 2016 08:16:17 -0000 1.7.2.3 @@ -12,7 +12,7 @@ } set title "Last 100 Requests" -set context [list "Last 100 Requests"] +set context [list $title] set stat [list] foreach {key value} [throttle last100] {lappend stat $value} Index: openacs-4/packages/xotcl-request-monitor/www/long-calls.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/long-calls.adp,v diff -u -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/xotcl-request-monitor/www/long-calls.adp 28 Nov 2016 08:20:17 -0000 1.2.2.2 +++ openacs-4/packages/xotcl-request-monitor/www/long-calls.adp 30 Nov 2016 08:16:17 -0000 1.2.2.3 @@ -1,6 +1,9 @@ doc +@context;literal@ -

+ +

Long Calls

+
 Lines: 20, 50, 100, @@ -10,9 +13,9 @@ 2000, 5000, 10000 -

+  +
- Index: openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl,v diff -u -r1.2.2.3 -r1.2.2.4 --- openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl 18 May 2016 12:39:10 -0000 1.2.2.3 +++ openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl 30 Nov 2016 08:16:17 -0000 1.2.2.4 @@ -60,6 +60,7 @@ set doc(title) "Long Calls" set context [list $doc(title)] + template::head::add_css -href //maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css -media all template::head::add_css -href //maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css -media all Index: openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.adp,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.adp 7 Jul 2015 12:22:07 -0000 1.3 +++ openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.adp 30 Nov 2016 08:16:17 -0000 1.3.2.1 @@ -1,5 +1,6 @@ @title;literal@ +@context;literal@
@throttle_statistics;noquote@
Index: openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl 10 Sep 2015 08:10:47 -0000 1.3.2.1 +++ openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl 30 Nov 2016 08:16:17 -0000 1.3.2.2 @@ -11,6 +11,7 @@ } set title "Throttle statistics" +set context [list $title] set throttle_statistics [throttle statistics] set data [throttle url_statistics]