aboutsummaryrefslogtreecommitdiffstats
path: root/src/upstream.c
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rambler-co.ru>2009-12-22 01:32:18 +0300
committerVsevolod Stakhov <vsevolod@rambler-co.ru>2009-12-22 01:32:18 +0300
commite413f4ee9cd298baab701df31ab4c1cb91c7c4b6 (patch)
tree46858bef680c8a09b6d1d58a5ca7e3a8cec4e62d /src/upstream.c
parenta079dac866ac4e166a8d6e40f978af74e8398583 (diff)
downloadrspamd-e413f4ee9cd298baab701df31ab4c1cb91c7c4b6.tar.gz
rspamd-e413f4ee9cd298baab701df31ab4c1cb91c7c4b6.zip
* Introduce new logging system:
- independent and customizeable buffering - line buffering - errors handling support - custom (ip based) debug - append function name automaticaly (based on __FUNCTION__) - add some logic to logs system
Diffstat (limited to 'src/upstream.c')
-rw-r--r--src/upstream.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/upstream.c b/src/upstream.c
index fac7d3381..cb5171075 100644
--- a/src/upstream.c
+++ b/src/upstream.c
@@ -120,7 +120,6 @@ check_upstream (struct upstream *up, time_t now, time_t error_timeout, time_t re
{
if (up->dead) {
if (now - up->time >= revive_timeout) {
- msg_debug ("check_upstream: reviving upstream after %ld seconds", (long int)now - up->time);
U_WLOCK ();
up->dead = 0;
up->errors = 0;
@@ -131,7 +130,6 @@ check_upstream (struct upstream *up, time_t now, time_t error_timeout, time_t re
}
else {
if (now - up->time >= error_timeout && up->errors >= max_errors) {
- msg_debug ("check_upstream: marking upstreams as dead after %ld errors", (long int)up->errors);
U_WLOCK ();
up->dead = 1;
up->time = now;
@@ -185,7 +183,6 @@ revive_all_upstreams (void *ups, size_t members, size_t msize)
u_char *p;
U_WLOCK ();
- msg_debug ("revive_all_upstreams: starting reviving all upstreams");
p = ups;
for (i = 0; i < members; i++) {
cur = (struct upstream *)p;
@@ -225,7 +222,6 @@ rescan_upstreams (void *ups, size_t members, size_t msize, time_t now, time_t er
alive = members;
}
- msg_debug ("rescan_upstreams: %d upstreams alive", alive);
return alive;
@@ -300,7 +296,6 @@ get_random_upstream (void *ups, size_t members, size_t msize, time_t now, time_t
alive = rescan_upstreams (ups, members, msize, now, error_timeout, revive_timeout, max_errors);
selected = rand () % alive;
- msg_debug ("get_random_upstream: return upstream with number %d of %d", selected, alive);
return get_upstream_by_number (ups, members, msize, selected);
}
@@ -327,7 +322,6 @@ get_upstream_by_hash (void *ups, size_t members, size_t msize, time_t now, time_
h = (h >> 16) & 0x7fff;
#endif
h %= members;
- msg_debug ("get_upstream_by_hash: try to select upstream number %d of %zd", h, members);
for (;;) {
p = (char *)ups + msize * h;
@@ -344,10 +338,8 @@ get_upstream_by_hash (void *ups, size_t members, size_t msize, time_t now, time_
h += ht;
#endif
h %= members;
- msg_debug ("get_upstream_by_hash: try to select upstream number %d of %zd, tries: %d", h, members, tries);
tries++;
if (tries > MAX_TRIES) {
- msg_debug ("get_upstream_by_hash: max tries exceed, returning NULL");
return NULL;
}
}
@@ -403,7 +395,6 @@ get_upstream_round_robin (void *ups, size_t members, size_t msize, time_t now, t
}
U_UNLOCK ();
}
- msg_debug ("get_upstream_round_robin: selecting upstream with weight %d", max_weight);
return selected;
}
@@ -436,7 +427,6 @@ get_upstream_master_slave (void *ups, size_t members, size_t msize, time_t now,
p += msize;
}
U_UNLOCK ();
- msg_debug ("get_upstream_master_slave: selecting upstream with priority %d", max_weight);
return selected;
}