From 7cc419ae1d7557c16c228041bc5ddde87b052d6a Mon Sep 17 00:00:00 2001 From: Baptiste Assmann Date: Tue, 7 Jul 2015 22:02:20 +0200 Subject: [PATCH] MINOR: server: new server flag: SRV_F_FORCED_ID This flag aims at reporting whether the server unique id (srv->puid) has been forced by the administrator in HAProxy's configuration. If not set, it means HAProxy has generated automatically the server's unique id. --- include/types/server.h | 1 + src/server.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/types/server.h b/include/types/server.h index 6a7e5586cf..130c370f7a 100644 --- a/include/types/server.h +++ b/include/types/server.h @@ -86,6 +86,7 @@ enum srv_admin { #define SRV_F_MAPPORTS 0x0002 /* this server uses mapped ports */ #define SRV_F_NON_STICK 0x0004 /* never add connections allocated to this server to a stick table */ #define SRV_F_USE_NS_FROM_PP 0x0008 /* use namespace associated with connection if present */ +#define SRV_F_FORCED_ID 0x0010 /* server's ID was forced in the configuration */ /* configured server options for send-proxy (server->pp_opts) */ #define SRV_PP_V1 0x0001 /* proxy protocol version 1 */ diff --git a/src/server.c b/src/server.c index ee52903f6e..901967421f 100644 --- a/src/server.c +++ b/src/server.c @@ -161,6 +161,7 @@ static int srv_parse_id(char **args, int *cur_arg, struct proxy *curproxy, struc } eb32_insert(&curproxy->conf.used_server_id, &newsrv->conf.id); + newsrv->flags |= SRV_F_FORCED_ID; return 0; } -- 2.47.3