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

BUG/MINOR: hlua: report proper context upon error in hlua_cli_io_handler_fct()

Browse Source 
As a result of copy pasting, hlua_cli_io_handler_fct() used to report lua
exceptions like E_ETMOUT as "Lua converter" instead of "Lua cli".

Let's fix that.

It could be backported to all stable versions.

[ada: for older versions, HLUA_E_BTMOUT case didn't exist so it has to be
 skipped]

(cherry picked from commit 185d230e2c615ee723270c81e4eb1eec20181918)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
This commit is contained in:
Aurelien DARRAGON 2024-06-21 19:12:37 +02:00 committed by Christopher Faulet
parent d5c8676f4c
commit 08cc27085e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hlua.c
View File

@ -11755,22 +11755,22 @@ static int hlua_cli_io_handler_fct(struct appctx *appctx)
return 1;
case HLUA_E_ETMOUT:
SEND_ERR(NULL, "Lua converter '%s': execution timeout.\n",
SEND_ERR(NULL, "Lua cli '%s': execution timeout.\n",
fcn->name);
return 1;
case HLUA_E_BTMOUT:
SEND_ERR(NULL, "Lua converter '%s': burst timeout.\n",
SEND_ERR(NULL, "Lua cli '%s': burst timeout.\n",
fcn->name);
return 1;
case HLUA_E_NOMEM:
SEND_ERR(NULL, "Lua converter '%s': out of memory error.\n",
SEND_ERR(NULL, "Lua cli '%s': out of memory error.\n",
fcn->name);
return 1;
case HLUA_E_YIELD: /* unexpected */
SEND_ERR(NULL, "Lua converter '%s': yield not allowed.\n",
SEND_ERR(NULL, "Lua cli '%s': yield not allowed.\n",
fcn->name);
return 1;