From 159cd4f9a5151f6a1b5a6415627bacd5da12809c Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 27 Apr 2012 13:07:06 +0000 Subject: [PATCH] Merge r1305586 from trunk: Be more verbose when logging syntax errors Submitted by: sf Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1331413 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 5 ----- modules/lua/lua_vmprep.c | 20 +++----------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/STATUS b/STATUS index 571ed0ed34..3ccfcf5f6e 100644 --- a/STATUS +++ b/STATUS @@ -103,11 +103,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4 patch: Trunk patch works +1: sf, jorton, jim - * mod_lua: Log better error message if parsing of a script fails (including - the line number of a syntax error!). - Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1305586 - 2.4 patch: Trunk patch works - +1: sf, jorton, jim PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c index 7c383ca94a..1ffe5e2559 100644 --- a/modules/lua/lua_vmprep.c +++ b/modules/lua/lua_vmprep.c @@ -357,24 +357,10 @@ static apr_status_t vm_construct(void **vm, void *params, apr_pool_t *lifecycle_ "loading lua file %s", spec->file); rc = luaL_loadfile(L, spec->file); if (rc != 0) { - char *err; - switch (rc) { - case LUA_ERRSYNTAX: - err = "syntax error"; - break; - case LUA_ERRMEM: - err = "memory allocation error"; - break; - case LUA_ERRFILE: - err = "error opening or reading file"; - break; - default: - err = "unknown error"; - break; - } ap_log_perror(APLOG_MARK, APLOG_ERR, 0, lifecycle_pool, APLOGNO(01482) - "Loading lua file %s: %s", - spec->file, err); + "Error loading %s: %s", spec->file, + rc == LUA_ERRMEM ? "memory allocation error" + : lua_tostring(L, 0)); return APR_EBADF; } lua_pcall(L, 0, LUA_MULTRET, 0); -- 2.40.0