ruleset: improve error formatting

Signed-off-by: He Xian <[email protected]>

src/ruleset.c

@@ -63,9 +63,14 @@ static void *l_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
 static int l_panic(lua_State *L)
 {
 	const int type = lua_type(L, -1);
-	if (type == LUA_TSTRING) {
+	switch (type) {
+	case LUA_TNIL:
+		LOG_STACK(FATAL, 0, "panic: (nil)");
+		break;
+	case LUA_TSTRING:
 		LOG_STACK_F(FATAL, 0, "panic: %s", lua_tostring(L, -1));
-	} else {
+		break;
+	default:
 		LOG_STACK_F(
 			FATAL, 0, "panic: (%s: %p)", lua_typename(L, type),
 			lua_topointer(L, -1));

src/ruleset/base.c

@@ -136,17 +136,26 @@ struct dialreq *aux_todialreq(lua_State *restrict L, const int n)
 
 int aux_traceback(lua_State *restrict L)
 {
-	const char *err = lua_tostring(L, 1);
+	const int type = lua_type(L, 1);
+	const char *err;
+	switch (type) {
+	case LUA_TNIL:
+		err = "(nil)";
+		break;
+	case LUA_TNUMBER:
+	case LUA_TSTRING:
+		err = lua_tostring(L, 1);
+		break;
+	default:
+		err = lua_pushfstring(
+			L, "(%s: %p)", lua_typename(L, type),
+			lua_topointer(L, 1));
+	}
+	LOG_STACK_F(WARNING, 0, "traceback: %s", err);
 	luaL_traceback(L, L, err, 1);
 	size_t len;
 	const char *s = lua_tolstring(L, -1, &len);
-	if (err == NULL) {
-		LOG_STACK(WARNING, 0, "C traceback");
-		LOG_TXT(WARNING, s, len, "Lua traceback");
-		return 1;
-	}
-	LOG_STACK_F(WARNING, 0, "C traceback for `%s'", err);
-	LOG_TXT_F(WARNING, s, len, "Lua traceback for `%s'", err);
+	LOG_TXT_F(VERBOSE, s, len, "traceback: %s", err);
 	return 1;
 }