lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-08-19 09:42:06 +03:00
Code Activity

Added mg_exec_lua_script, mg_prepare_lua_environment -> prepare_lua_environment

Browse Source
This commit is contained in:
Sergey Lyubka
2013-08-08 13:11:05 +01:00
parent 421c16b2bb
commit 743f48b8e0
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mod_lua.c
View File

@@ -242,7 +242,7 @@ static int lsp_redirect(lua_State *L) {
return 0; return 0;
} }
void mg_prepare_lua_environment(struct mg_connection *conn, lua_State *L) { static void prepare_lua_environment(struct mg_connection *conn, lua_State *L) {
const struct mg_request_info *ri = mg_get_request_info(conn); const struct mg_request_info *ri = mg_get_request_info(conn);
extern void luaL_openlibs(lua_State *); extern void luaL_openlibs(lua_State *);
int i; int i;
@@ -296,6 +296,36 @@ void mg_prepare_lua_environment(struct mg_connection *conn, lua_State *L) {
"debug.traceback(e, 1)) end"); "debug.traceback(e, 1)) end");
} }
static int lua_error_handler(lua_State *L) {
lua_getglobal(L, "mg");
if (!lua_isnil(L, -1)) {
luaL_dostring(L, "mg.write(debug.traceback())");
} else {
printf("Lua error: [%s]\n", lua_isstring(L, -2) ?
lua_tostring(L, -2) : "unknown error");
luaL_dostring(L, "print(debug.traceback())");
}
return 0;
}
void mg_exec_lua_script(struct mg_connection *conn, const char *path,
const char *buf, int buf_size) {
lua_State *L;
if (path != NULL && (L = luaL_newstate()) != NULL) {
prepare_lua_environment(conn, L);
lua_pushcclosure(L, &lua_error_handler, 0);
if (buf != NULL) {
luaL_loadbuffer(L, buf, buf_size, path);
} else {
luaL_loadfile(L, path);
}
lua_pcall(L, 0, 0, -2);
lua_close(L);
}
}
static void lsp_send_err(struct mg_connection *conn, struct lua_State *L, static void lsp_send_err(struct mg_connection *conn, struct lua_State *L,
const char *fmt, ...) { const char *fmt, ...) {
char buf[MG_BUF_LEN]; char buf[MG_BUF_LEN];
@@ -333,7 +363,7 @@ static int handle_lsp_request(struct mg_connection *conn, const char *path,
} else { } else {
// We're not sending HTTP headers here, Lua page must do it. // We're not sending HTTP headers here, Lua page must do it.
if (ls == NULL) { if (ls == NULL) {
mg_prepare_lua_environment(conn, L); prepare_lua_environment(conn, L);
if (conn->ctx->callbacks.init_lua != NULL) { if (conn->ctx->callbacks.init_lua != NULL) {
conn->ctx->callbacks.init_lua(conn, L); conn->ctx->callbacks.init_lua(conn, L);
} }

2
test/unit_test.c
View File

@@ -554,7 +554,7 @@ static void test_lua(void) {
&conn.request_info); &conn.request_info);
conn.content_len = conn.data_len - conn.request_len; conn.content_len = conn.data_len - conn.request_len;
mg_prepare_lua_environment(&conn, L); prepare_lua_environment(&conn, L);
ASSERT(lua_gettop(L) == 0); ASSERT(lua_gettop(L) == 0);
check_lua_expr(L, "'hi'", "hi"); check_lua_expr(L, "'hi'", "hi");