projects / packages / squid.git / blame
| Commit | Line | Data |
|---|---|---|
| 230f348a AM |
1 | Index: squid/src/helper.c |
| 2 | diff -c squid/src/helper.c:1.34.2.15 squid/src/helper.c:1.34.2.16 | |
| 3 | *** squid/src/helper.c:1.34.2.15 Mon Feb 9 02:03:49 2004 | |
| 4 | --- squid/src/helper.c Thu Mar 11 08:26:30 2004 | |
| 5 | *************** | |
| 6 | *** 743,761 **** | |
| 7 | hlp->stats.queue_size++; | |
| 8 | if (hlp->stats.queue_size < hlp->n_running) | |
| 9 | return; | |
| 10 | ! if (hlp->stats.queue_size < hlp->n_running) | |
| 11 | ! return; | |
| 12 | if (squid_curtime - hlp->last_queue_warn < 30) | |
| 13 | return; | |
| 14 | if (shutting_down || reconfiguring) | |
| 15 | return; | |
| 16 | - hlp->last_queue_warn = squid_curtime; | |
| 17 | debug(84, 1) ("WARNING: All %s processes are busy.\n", hlp->id_name); | |
| 18 | debug(84, 1) ("WARNING: up to %d pending requests queued\n", hlp->stats.max_queue_size); | |
| 19 | if (hlp->stats.queue_size > hlp->n_running * 2) | |
| 20 | fatalf("Too many queued %s requests (%d on %d)", hlp->id_name, hlp->stats.queue_size, hlp->n_running); | |
| 21 | ! if (hlp->stats.max_queue_size > 1) | |
| 22 | debug(84, 1) ("Consider increasing the number of %s processes to at least %d in your config file.\n", hlp->id_name, hlp->n_running + hlp->stats.max_queue_size); | |
| 23 | hlp->stats.max_queue_size = hlp->stats.queue_size; | |
| 24 | } | |
| 25 | ||
| 26 | --- 743,761 ---- | |
| 27 | hlp->stats.queue_size++; | |
| 28 | if (hlp->stats.queue_size < hlp->n_running) | |
| 29 | return; | |
| 30 | ! if (hlp->stats.queue_size > hlp->stats.max_queue_size) | |
| 31 | ! hlp->stats.max_queue_size = hlp->stats.queue_size; | |
| 32 | if (squid_curtime - hlp->last_queue_warn < 30) | |
| 33 | return; | |
| 34 | if (shutting_down || reconfiguring) | |
| 35 | return; | |
| 36 | debug(84, 1) ("WARNING: All %s processes are busy.\n", hlp->id_name); | |
| 37 | debug(84, 1) ("WARNING: up to %d pending requests queued\n", hlp->stats.max_queue_size); | |
| 38 | if (hlp->stats.queue_size > hlp->n_running * 2) | |
| 39 | fatalf("Too many queued %s requests (%d on %d)", hlp->id_name, hlp->stats.queue_size, hlp->n_running); | |
| 40 | ! if (squid_curtime - hlp->last_queue_warn < 300) | |
| 41 | debug(84, 1) ("Consider increasing the number of %s processes to at least %d in your config file.\n", hlp->id_name, hlp->n_running + hlp->stats.max_queue_size); | |
| 42 | + hlp->last_queue_warn = squid_curtime; | |
| 43 | hlp->stats.max_queue_size = hlp->stats.queue_size; | |
| 44 | } | |
| 45 | ||
| 46 | *************** | |
| 47 | *** 775,785 **** | |
| 48 | return; | |
| 49 | if (shutting_down || reconfiguring) | |
| 50 | return; | |
| 51 | - hlp->last_queue_warn = squid_curtime; | |
| 52 | debug(84, 1) ("WARNING: All %s processes are busy.\n", hlp->id_name); | |
| 53 | debug(84, 1) ("WARNING: up to %d pending requests queued\n", hlp->stats.max_queue_size); | |
| 54 | ! if (hlp->stats.max_queue_size > 1) | |
| 55 | debug(84, 1) ("Consider increasing the number of %s processes to at least %d in your config file.\n", hlp->id_name, hlp->n_running + hlp->stats.max_queue_size); | |
| 56 | hlp->stats.max_queue_size = hlp->stats.queue_size; | |
| 57 | } | |
| 58 | ||
| 59 | --- 775,785 ---- | |
| 60 | return; | |
| 61 | if (shutting_down || reconfiguring) | |
| 62 | return; | |
| 63 | debug(84, 1) ("WARNING: All %s processes are busy.\n", hlp->id_name); | |
| 64 | debug(84, 1) ("WARNING: up to %d pending requests queued\n", hlp->stats.max_queue_size); | |
| 65 | ! if (squid_curtime - hlp->last_queue_warn < 300) | |
| 66 | debug(84, 1) ("Consider increasing the number of %s processes to at least %d in your config file.\n", hlp->id_name, hlp->n_running + hlp->stats.max_queue_size); | |
| 67 | + hlp->last_queue_warn = squid_curtime; | |
| 68 | hlp->stats.max_queue_size = hlp->stats.queue_size; | |
| 69 | } | |
| 70 |