From: Quentin Young <qlyoung@nvidia.com>
Date: Sun, 29 Nov 2020 18:21:50 +0000 (-0500)
Subject: lib: better load-time error handling for scripts
X-Git-Tag: base_7.6~25^2~15
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=224782816d52af6926122c7a036c66ac23e759a7;p=matthieu%2Ffrr.git

lib: better load-time error handling for scripts

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
---

diff --git a/lib/frrscript.c b/lib/frrscript.c
index 8623415ef8..bc6d075810 100644
--- a/lib/frrscript.c
+++ b/lib/frrscript.c
@@ -173,21 +173,25 @@ struct frrscript *frrscript_load(const char *name,
 	case LUA_OK:
 		break;
 	case LUA_ERRSYNTAX:
-		zlog_err("Failed loading script '%s': syntax error", fname);
+		zlog_err("Failed loading script '%s': syntax error: %s", fname,
+			 lua_tostring(fs->L, -1));
 		break;
 	case LUA_ERRMEM:
-		zlog_err("Failed loading script '%s': out-of-memory error",
-			 fname);
+		zlog_err("Failed loading script '%s': out-of-memory error: %s",
+			 fname, lua_tostring(fs->L, -1));
 		break;
 	case LUA_ERRGCMM:
-		zlog_err("Failed loading script '%s': garbage collector error",
-			 fname);
+		zlog_err(
+			"Failed loading script '%s': garbage collector error: %s",
+			fname, lua_tostring(fs->L, -1));
 		break;
 	case LUA_ERRFILE:
-		zlog_err("Failed loading script '%s': file read error", fname);
+		zlog_err("Failed loading script '%s': file read error: %s",
+			 fname, lua_tostring(fs->L, -1));
 		break;
 	default:
-		zlog_err("Failed loading script '%s': unknown error", fname);
+		zlog_err("Failed loading script '%s': unknown error: %s", fname,
+			 lua_tostring(fs->L, -1));
 		break;
 	}