The fatal helper queue overflow condition should not be limited by

the warning rate limitation.

diff --git a/src/helper.cc b/src/helper.cc
index 29cddc87421dd63544205202dfb0033d948e378e..c7c59d9cf70df2b233979f5ff3f0154e11adb970 100644 (file)
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: helper.cc,v 1.36 2002/04/28 14:55:40 hno Exp $
+ * $Id: helper.cc,v 1.37 2002/05/15 10:30:27 hno Exp $
  *
  * DEBUG: section 29    Helper process maintenance
  * AUTHOR: Harvest Derived?
@@ -872,6 +872,8 @@ StatefulEnqueue(statefulhelper * hlp, helper_stateful_request * r)
     hlp->stats.queue_size++;
     if (hlp->stats.queue_size < hlp->n_running)
        return;
+    if (hlp->stats.queue_size > hlp->n_running * 2)
+       fatalf("Too many queued %s requests", hlp->id_name);
     if (squid_curtime - hlp->last_queue_warn < 600)
        return;
     if (shutting_down || reconfiguring)
@@ -879,8 +881,6 @@ StatefulEnqueue(statefulhelper * hlp, helper_stateful_request * r)
     hlp->last_queue_warn = squid_curtime;
     debug(14, 0) ("WARNING: All %s processes are busy.\n", hlp->id_name);
     debug(14, 0) ("WARNING: %d pending requests queued\n", hlp->stats.queue_size);
-    if (hlp->stats.queue_size > hlp->n_running * 2)
-       fatalf("Too many queued %s requests", hlp->id_name);
     debug(14, 1) ("Consider increasing the number of %s processes in your config file.\n", hlp->id_name);
 }