mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: checks: support specific check reporting for the agent

Browse Source 
Indicate "Agent" instead of "Health" in health check reports sent when
"option log-health-checks" is set. Also, ensure that any agent check
status change is correctly reported. Till now we used not to emit logs
when the agent could not be reached.
This commit is contained in:
Willy Tarreau 2014-05-23 11:32:36 +02:00
parent 9638efa2a0
commit 12634e1428
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/checks.c
View File

@ -232,17 +232,16 @@ static void set_server_check_status(struct check *check, short status, const cha
tv_zero(&check->start);
}
/* Failure to connect to the agent as a secondary check should not
* cause the server to be marked down.
*/
if ((check->state & CHK_ST_AGENT) && check->status < HCHK_STATUS_L7TOUT)
return;
report = 0;
switch (check->result) {
case CHK_RES_FAILED:
if (check->health >= check->rise) {
/* Failure to connect to the agent as a secondary check should not
* cause the server to be marked down.
*/
if ((!(check->state & CHK_ST_AGENT) ||
(check->status >= HCHK_STATUS_L7TOUT)) &&
(check->health >= check->rise)) {
s->counters.failed_checks++;
report = 1;
check->health--;
@ -274,7 +273,8 @@ static void set_server_check_status(struct check *check, short status, const cha
if (s->proxy->options2 & PR_O2_LOGHCHKS &&
(status != prev_status || report)) {
chunk_printf(&trash,
"Health check for %sserver %s/%s %s%s",
"%s check for %sserver %s/%s %s%s",
(check->state & CHK_ST_AGENT) ? "Agent" : "Health",
s->flags & SRV_F_BACKUP ? "backup " : "",
s->proxy->id, s->id,
(check->result == CHK_RES_CONDPASS) ? "conditionally ":"",