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 -N -r1.43.2.16 -r1.43.2.17 --- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 28 Feb 2017 09:00:16 -0000 1.43.2.16 +++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 28 Feb 2017 17:42:00 -0000 1.43.2.17 @@ -1535,21 +1535,21 @@ :get_context # :log "### check" - lassign [:throttle_check ${:requestor} ${:pa} ${:url} \ + lassign [my throttle_check ${:requestor} ${:pa} ${:url} \ [ns_conn start] [ns_guesstype [ns_conn url]] ${:community_id}] \ toMuch ms repeat #set t1 [clock milliseconds] if {$repeat} { - :add_statistics repeat ${:requestor} ${:pa} ${:url} ${:query} + my add_statistics repeat ${:requestor} ${:pa} ${:url} ${:query} set result -1 } elseif {$toMuch} { :log "*** we have to refuse user ${:requestor} with $toMuch requests" - :add_statistics reject ${:requestor} ${:pa} ${:url} ${:query} + my add_statistics reject ${:requestor} ${:pa} ${:url} ${:query} set result $toMuch } elseif {$ms} { :log "*** we have to block user ${:requestor} for $ms ms" - :add_statistics throttle ${:requestor} ${:pa} ${:url} ${:query} + my add_statistics throttle ${:requestor} ${:pa} ${:url} ${:query} after $ms :log "*** continue for user ${:requestor}" set result 0 @@ -1621,7 +1621,7 @@ :get_context # :log "CT=[ns_set array [ns_conn outputheaders]] -- ${:url}" - :add_url_stat ${:method} ${:url} [:partialtimes] ${:requestor} ${:pa} \ + my add_url_stat ${:method} ${:url} [:partialtimes] ${:requestor} ${:pa} \ [ns_set get [ns_conn outputheaders] Content-Type] unset :context_initialized return filter_ok