From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Fri, 21 Jun 2024 17:12:37 +0000 (+0200)
Subject: BUG/MINOR: hlua: report proper context upon error in hlua_cli_io_handler_fct()
X-Git-Tag: v3.1-dev2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=185d230e2c615ee723270c81e4eb1eec20181918;p=thirdparty%2Fhaproxy.git

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

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]
---

diff --git a/src/hlua.c b/src/hlua.c
index 0a0e2be751..94a6e49983 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -11747,22 +11747,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;