Index: openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-init.tcl,v
diff -u -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-init.tcl	3 Sep 2020 09:12:02 -0000	1.9.2.2
+++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-init.tcl	13 Nov 2020 20:13:20 -0000	1.9.2.3
@@ -43,6 +43,12 @@
   ad_schedule_proc -thread t 61 ::xo::job_dequeue
 }
 
+#
+# Launch the pool remapper background job to move requests to the slow
+# pool, even before these are finished. This is necessary for jobs
+# which are never finishing.
+# 
+ad_schedule_proc -thread t 59 ::xo::pool_remap_watchdog
 
 # Local variables:
 #    mode: tcl
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.67.2.29 -r1.67.2.30
--- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	8 Nov 2020 14:03:01 -0000	1.67.2.29
+++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	13 Nov 2020 20:13:20 -0000	1.67.2.30
@@ -432,23 +432,12 @@
       incr ::agg_time($url) $totaltime
       incr ::count(calls:$url)
     }
+    
+    ::xo::remap_pool -runtime [dict get $partialtimes runtime] $method $url
+    
     #
-    # NaviServer connection pool management: when we have a connection
-    # pool for slow requests, and the query took longer than 3
-    # seconds, and the URL is not / or /dotlrn, then move this request
-    # to the "slow" pool.
-    #
-    if {[dict get $partialtimes runtime] > 3.0
-        && [::acs::icanuse "ns_server unmap"]
-        && "slow" in [ns_server pools]
-        && [ns_server mapped [list $method $url]] eq ""
-        && $url ni {/ /dotlrn/}
-      } {
-      ns_server -pool slow map -noinherit [list $method $url]
-      ns_log notice "slow request: '$url' moved to slow connection pool"
-    }
-    #
     # Handling of longcalls counter
+    #
     if {$conntime > 3000
         || [dict get $partialtimes filtertime] > 1.0
         || [dict get $partialtimes queuetime] > 0.5
@@ -796,7 +785,7 @@
     Return a list of lists containing information about current
     users. If the switch 'full' is used this list contains these users
     who have used the server within the monitoring time window (per
-                                                                default: 10 minutes). Otherwise, just a list of requestors
+    default: 10 minutes). Otherwise, just a list of requestors
     (user_ids or peer addresses for unauthenticated requests) is
     returned.
 
@@ -1843,6 +1832,39 @@
 
 namespace eval ::xo {
 
+  ad_proc ::xo::remap_pool {-runtime method url} {
+    #
+    # NaviServer connection pool management: when we have a connection
+    # pool for slow requests, and the query took longer than 3
+    # seconds, and the URL is not / or /dotlrn, then move this request
+    # to the "slow" pool.
+    #
+    if {$runtime > 3.0
+        && [::acs::icanuse "ns_server unmap"]
+        && "slow" in [ns_server pools]
+        && [ns_server mapped [list $method $url]] eq ""
+        && $url ni {/ /dotlrn/}
+      } {
+      ns_server -pool slow map -noinherit [list $method $url]
+      ns_log notice "slow request: '$url' moved to slow connection pool"
+    }
+  }
+
+  ad_proc ::xo::pool_remap_watchdog {} {
+    foreach s [ns_info servers] {
+      set reqs [ns_server -server $s -pool "" all]
+      foreach req $reqs {
+        set runtime [lindex $req end-1]
+        if {$runtime >= 3.0} {
+          set method [lindex $req 3]
+          set url [lindex $req 4]
+          ns_log notice "CALL REMAP ::xo::remap_pool -runtime $runtime $method $url"
+          ::xo::remap_pool -runtime $runtime $method $url
+        }
+      }
+    }
+  }
+  
   proc is_ip {key} {
     expr { [string match "*.*" $key] || [string match "*:*" $key] }
   }