RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-24 13:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: lua: set a dummy file name and line number on the dummy servers

Browse Source 
The "socket_tcp" and "socket_ssl" servers had no config file name nor
line number, but this is sometimes annoying during debugging or later
in error messages, while all other places using new_server() or
parse_server() make sure to have a valid file:line set. Let's set
something to address this.
This commit is contained in:
Willy Tarreau 2021-03-05 10:41:48 +01:00
parent 5b5974104f
commit 0f143afe1b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hlua.c
View File

@ -9181,6 +9181,8 @@ void hlua_init(void) {
socket_tcp.safe_conns_tree = NULL; socket_tcp.safe_conns_tree = NULL;
socket_tcp.next_state = SRV_ST_RUNNING; /* early server setup */ socket_tcp.next_state = SRV_ST_RUNNING; /* early server setup */
socket_tcp.last_change = 0; socket_tcp.last_change = 0;
socket_tcp.conf.file = strdup("HLUA_INTERNAL");
socket_tcp.conf.line = 1;
socket_tcp.id = "LUA-TCP-CONN"; socket_tcp.id = "LUA-TCP-CONN";
socket_tcp.check.state &= ~CHK_ST_ENABLED; /* Disable health checks. */ socket_tcp.check.state &= ~CHK_ST_ENABLED; /* Disable health checks. */
socket_tcp.agent.state &= ~CHK_ST_ENABLED; /* Disable health checks. */ socket_tcp.agent.state &= ~CHK_ST_ENABLED; /* Disable health checks. */
@ -9226,6 +9228,8 @@ void hlua_init(void) {
socket_ssl.safe_conns_tree = NULL; socket_ssl.safe_conns_tree = NULL;
socket_ssl.next_state = SRV_ST_RUNNING; /* early server setup */ socket_ssl.next_state = SRV_ST_RUNNING; /* early server setup */
socket_ssl.last_change = 0; socket_ssl.last_change = 0;
socket_ssl.conf.file = strdup("HLUA_INTERNAL");
socket_ssl.conf.line = 2;
socket_ssl.id = "LUA-SSL-CONN"; socket_ssl.id = "LUA-SSL-CONN";
socket_ssl.check.state &= ~CHK_ST_ENABLED; /* Disable health checks. */ socket_ssl.check.state &= ~CHK_ST_ENABLED; /* Disable health checks. */
socket_ssl.agent.state &= ~CHK_ST_ENABLED; /* Disable health checks. */ socket_ssl.agent.state &= ~CHK_ST_ENABLED; /* Disable health checks. */
@ -9290,6 +9294,10 @@ static void hlua_deinit()
if (hlua_states[thr]) if (hlua_states[thr])
lua_close(hlua_states[thr]); lua_close(hlua_states[thr]);
} }
ha_free((char**)&socket_tcp.conf.file);
#ifdef USE_OPENSSL
ha_free((char**)&socket_ssl.conf.file);
#endif
} }
REGISTER_POST_DEINIT(hlua_deinit); REGISTER_POST_DEINIT(hlua_deinit);