1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: lua: allow changing port with set_addr

Browse Source 
Add an optional port parameter, which can be either a number or a
string (to support '+' and '-' for port mapping).

This fixes issue #586.
This commit is contained in:
Joseph C. Sible 2020-05-04 22:20:32 -04:00 committed by Christopher Faulet
parent 3970819a55
commit 49bbf528e4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/lua-api/index.rst
View File

@ -976,7 +976,7 @@ Server class
server. server.
:returns: an integer. :returns: an integer.
.. js:function:: Server.set_addr(sv, addr) .. js:function:: Server.set_addr(sv, addr[, port])
Dynamically change the address of the server. See the management socket Dynamically change the address of the server. See the management socket
documentation for more information about the format of the string. documentation for more information about the format of the string.

7
src/hlua_fcn.c
View File

@ -1034,13 +1034,18 @@ int hlua_server_set_addr(lua_State *L)
{ {
struct server *srv; struct server *srv;
const char *addr; const char *addr;
const char *port;
const char *err; const char *err;
srv = hlua_check_server(L, 1); srv = hlua_check_server(L, 1);
addr = luaL_checkstring(L, 2); addr = luaL_checkstring(L, 2);
if (lua_gettop(L) >= 3)
port = luaL_checkstring(L, 3);
else
port = NULL;
HA_SPIN_LOCK(SERVER_LOCK, &srv->lock); HA_SPIN_LOCK(SERVER_LOCK, &srv->lock);
err = server_parse_addr_change_request(srv, addr, "Lua script"); err = update_server_addr_port(srv, addr, port, "Lua script");
HA_SPIN_UNLOCK(SERVER_LOCK, &srv->lock); HA_SPIN_UNLOCK(SERVER_LOCK, &srv->lock);
if (!err) if (!err)
lua_pushnil(L); lua_pushnil(L);