RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-21 13:16:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG: check: move email_alert* from proxy-t.h to mailers-t.h

Browse Source 
These ones are specific to mailers and have nothing to do in proxy-t.h.
This commit is contained in:
Willy Tarreau 2020-06-05 14:55:20 +02:00
parent 51cd5956ee
commit d604ace940
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/haproxy/mailers-t.h
View File

@ -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 */

16
include/haproxy/proxy-t.h
View File

@ -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_* */