mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-09 16:47:18 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: mailers: Use pools to allocate email alerts and its tcpcheck_rules

Browse Source
This commit is contained in:
Christopher Faulet 2017-10-23 15:45:20 +02:00 committed by Willy Tarreau
parent 0108bb3e40
commit 31dff9b1bd
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/checks.c
View File

@ -68,6 +68,10 @@ static int tcpcheck_get_step_id(struct check *);
static char * tcpcheck_get_step_comment(struct check *, int); static char * tcpcheck_get_step_comment(struct check *, int);
static int tcpcheck_main(struct check *); static int tcpcheck_main(struct check *);
static struct pool_head *pool2_email_alert = NULL;
static struct pool_head *pool2_tcpcheck_rule = NULL;
static const struct check_status check_statuses[HCHK_STATUS_SIZE] = { static const struct check_status check_statuses[HCHK_STATUS_SIZE] = {
[HCHK_STATUS_UNKNOWN] = { CHK_RES_UNKNOWN, "UNK", "Unknown" }, [HCHK_STATUS_UNKNOWN] = { CHK_RES_UNKNOWN, "UNK", "Unknown" },
[HCHK_STATUS_INI] = { CHK_RES_UNKNOWN, "INI", "Initializing" }, [HCHK_STATUS_INI] = { CHK_RES_UNKNOWN, "INI", "Initializing" },
@ -3043,9 +3047,9 @@ void email_alert_free(struct email_alert *alert)
free(rule->string); free(rule->string);
if (rule->expect_regex) if (rule->expect_regex)
regex_free(rule->expect_regex); regex_free(rule->expect_regex);
free(rule); pool_free2(pool2_tcpcheck_rule, rule);
} }
free(alert); pool_free2(pool2_email_alert, alert);
} }
static struct task *process_email_alert(struct task *t) static struct task *process_email_alert(struct task *t)
@ -3168,14 +3172,15 @@ static int add_tcpcheck_expect_str(struct list *list, const char *str)
{ {
struct tcpcheck_rule *tcpcheck; struct tcpcheck_rule *tcpcheck;
tcpcheck = calloc(1, sizeof *tcpcheck); if ((tcpcheck = pool_alloc2(pool2_tcpcheck_rule)) == NULL)
if (!tcpcheck)
return 0; return 0;
memset(tcpcheck, 0, sizeof(*tcpcheck));
tcpcheck->action = TCPCHK_ACT_EXPECT; tcpcheck->action = TCPCHK_ACT_EXPECT;
tcpcheck->string = strdup(str); tcpcheck->string = strdup(str);
tcpcheck->expect_regex = NULL;
tcpcheck->comment = NULL;
if (!tcpcheck->string) { if (!tcpcheck->string) {
free(tcpcheck); pool_free2(pool2_tcpcheck_rule, tcpcheck);
return 0; return 0;
} }
@ -3190,19 +3195,19 @@ static int add_tcpcheck_send_strs(struct list *list, const char * const *strs)
char *dst; char *dst;
int i; int i;
tcpcheck = calloc(1, sizeof *tcpcheck); if ((tcpcheck = pool_alloc2(pool2_tcpcheck_rule)) == NULL)
if (!tcpcheck)
return 0; return 0;
memset(tcpcheck, 0, sizeof(*tcpcheck));
tcpcheck->action = TCPCHK_ACT_SEND; tcpcheck->action = TCPCHK_ACT_SEND;
tcpcheck->expect_regex = NULL;
tcpcheck->comment = NULL;
tcpcheck->string_len = 0; tcpcheck->string_len = 0;
for (i = 0; strs[i]; i++) for (i = 0; strs[i]; i++)
tcpcheck->string_len += strlen(strs[i]); tcpcheck->string_len += strlen(strs[i]);
tcpcheck->string = malloc(tcpcheck->string_len + 1); tcpcheck->string = malloc(tcpcheck->string_len + 1);
if (!tcpcheck->string) { if (!tcpcheck->string) {
free(tcpcheck); pool_free2(pool2_tcpcheck_rule, tcpcheck);
return 0; return 0;
} }
@ -3218,20 +3223,23 @@ static int add_tcpcheck_send_strs(struct list *list, const char * const *strs)
static int enqueue_one_email_alert(struct proxy *p, struct server *s, static int enqueue_one_email_alert(struct proxy *p, struct server *s,
struct email_alertq *q, const char *msg) struct email_alertq *q, const char *msg)
{ {
struct email_alert *alert = NULL; struct email_alert *alert;
struct tcpcheck_rule *tcpcheck; struct tcpcheck_rule *tcpcheck;
struct check *check = &q->check; struct check *check = &q->check;
alert = calloc(1, sizeof *alert); if ((alert = pool_alloc2(pool2_email_alert)) == NULL)
if (!alert) {
goto error; goto error;
} LIST_INIT(&alert->list);
LIST_INIT(&alert->tcpcheck_rules); LIST_INIT(&alert->tcpcheck_rules);
alert->srv = s; alert->srv = s;
tcpcheck = calloc(1, sizeof *tcpcheck);
if (!tcpcheck) if ((tcpcheck = pool_alloc2(pool2_tcpcheck_rule)) == NULL)
goto error; goto error;
tcpcheck->action = TCPCHK_ACT_CONNECT; memset(tcpcheck, 0, sizeof(*tcpcheck));
tcpcheck->action = TCPCHK_ACT_CONNECT;
tcpcheck->comment = NULL;
tcpcheck->string = NULL;
tcpcheck->expect_regex = NULL;
LIST_ADDQ(&alert->tcpcheck_rules, &tcpcheck->list); LIST_ADDQ(&alert->tcpcheck_rules, &tcpcheck->list);
if (!add_tcpcheck_expect_str(&alert->tcpcheck_rules, "220 ")) if (!add_tcpcheck_expect_str(&alert->tcpcheck_rules, "220 "))
@ -3410,6 +3418,9 @@ __attribute__((constructor))
static void __check_init(void) static void __check_init(void)
{ {
hap_register_post_check(start_checks); hap_register_post_check(start_checks);
pool2_email_alert = create_pool("email_alert", sizeof(struct email_alert), MEM_F_SHARED);
pool2_tcpcheck_rule = create_pool("tcpcheck_rule", sizeof(struct tcpcheck_rule), MEM_F_SHARED);
} }