diff options
author | Willy Tarreau <w@1wt.eu> | 2020-06-05 14:55:20 +0200 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2020-06-05 20:20:20 +0200 |
commit | 10ca7b6253e0b96095e6676c3c1145e470fd39dd (patch) | |
tree | 0550f4b88485aabcfade1db5bcce0292337ce5c0 | |
parent | 07ddaa69ba2c11afc5f171b1b3c9fcc64d4d529a (diff) | |
download | haproxy-10ca7b6253e0b96095e6676c3c1145e470fd39dd.tar.gz |
REORG: check: move email_alert* from proxy-t.h to mailers-t.h
These ones are specific to mailers and have nothing to do in proxy-t.h.
-rw-r--r-- | include/haproxy/mailers-t.h | 21 | ||||
-rw-r--r-- | include/haproxy/proxy-t.h | 16 |
2 files changed, 20 insertions, 17 deletions
diff --git a/include/haproxy/mailers-t.h b/include/haproxy/mailers-t.h index b2a3ac3e4..076a9f76d 100644 --- a/include/haproxy/mailers-t.h +++ b/include/haproxy/mailers-t.h @@ -31,6 +31,11 @@ #include <netinet/in.h> #include <arpa/inet.h> +#include <haproxy/check-t.h> +#include <haproxy/list-t.h> +#include <haproxy/tcpcheck-t.h> +#include <haproxy/thread-t.h> + struct mailer { char *id; struct mailers *mailers; @@ -45,7 +50,6 @@ struct mailer { struct mailer *next; /* next mailer in the list */ }; - struct mailers { char *id; /* mailers section name */ struct mailer *mailer_list; /* mailers in this mailers section */ @@ -61,5 +65,20 @@ struct mailers { } timeout; }; +struct email_alert { + struct list list; + struct tcpcheck_rules rules; + struct server *srv; +}; + +struct email_alertq { + struct list email_alerts; + struct check check; /* Email alerts are implemented using existing check + * code even though they are not checks. This structure + * is as a parameter to the check code. + * Each check corresponds to a mailer */ + __decl_thread(HA_SPINLOCK_T lock); +}; + #endif /* _HAPROXY_MAILERS_T_H */ diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h index 2abda3a61..e1fffb272 100644 --- a/include/haproxy/proxy-t.h +++ b/include/haproxy/proxy-t.h @@ -32,7 +32,6 @@ #include <haproxy/arg-t.h> #include <haproxy/backend-t.h> -#include <haproxy/check-t.h> #include <haproxy/counters-t.h> #include <haproxy/freq_ctr-t.h> #include <haproxy/list-t.h> @@ -251,21 +250,6 @@ struct error_snapshot { char buf[0]; /* copy of the beginning of the message for bufsize bytes */ }; -struct email_alert { - struct list list; - struct tcpcheck_rules rules; - struct server *srv; -}; - -struct email_alertq { - struct list email_alerts; - struct check check; /* Email alerts are implemented using existing check - * code even though they are not checks. This structure - * is as a parameter to the check code. - * Each check corresponds to a mailer */ - __decl_thread(HA_SPINLOCK_T lock); -}; - struct proxy { enum obj_type obj_type; /* object type == OBJ_TYPE_PROXY */ enum pr_state state; /* proxy state, one of PR_* */ |