www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Replace duplicate log msg numbers

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383013 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2012-09-10 18:06:48 +00:00
parent 7afd66d30e
commit 533878b7c7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/log-message-tags/next-number
View File

@@ -1 +1 @@
2328 2334

4
modules/lua/lua_vmprep.c
View File

@@ -486,11 +486,11 @@ AP_LUA_DECLARE(lua_State*)ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
} }
if (tryCache == 0 && spec->scope != AP_LUA_SCOPE_ONCE) { if (tryCache == 0 && spec->scope != AP_LUA_SCOPE_ONCE) {
int rc; int rc;
ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, lifecycle_pool, APLOGNO(01481) ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, lifecycle_pool, APLOGNO(02332)
"(re)loading lua file %s", spec->file); "(re)loading lua file %s", spec->file);
rc = luaL_loadfile(L, spec->file); rc = luaL_loadfile(L, spec->file);
if (rc != 0) { if (rc != 0) {
ap_log_perror(APLOG_MARK, APLOG_ERR, 0, lifecycle_pool, APLOGNO(01482) ap_log_perror(APLOG_MARK, APLOG_ERR, 0, lifecycle_pool, APLOGNO(02333)
"Error loading %s: %s", spec->file, "Error loading %s: %s", spec->file,
rc == LUA_ERRMEM ? "memory allocation error" rc == LUA_ERRMEM ? "memory allocation error"
: lua_tostring(L, 0)); : lua_tostring(L, 0));

8
modules/lua/mod_lua.c
View File

@@ -336,7 +336,7 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil
} }
if (!L) { if (!L) {
ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(01477) ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(02328)
"lua: Failed to obtain lua interpreter for %s %s", "lua: Failed to obtain lua interpreter for %s %s",
hook_spec->function_name, hook_spec->file_name); hook_spec->function_name, hook_spec->file_name);
ap_lua_release_state(L, spec, r); ap_lua_release_state(L, spec, r);
@@ -345,7 +345,7 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil
if (hook_spec->function_name != NULL) { if (hook_spec->function_name != NULL) {
lua_getglobal(L, hook_spec->function_name); lua_getglobal(L, hook_spec->function_name);
if (!lua_isfunction(L, -1)) { if (!lua_isfunction(L, -1)) {
ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(01478) ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(02329)
"lua: Unable to find function %s in %s", "lua: Unable to find function %s in %s",
hook_spec->function_name, hook_spec->function_name,
hook_spec->file_name); hook_spec->file_name);
@@ -711,7 +711,7 @@ static int lua_map_handler(request_rec *r)
L = ap_lua_get_lua_state(pool, spec, r); L = ap_lua_get_lua_state(pool, spec, r);
if (!L) { if (!L) {
ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(01477) ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(02330)
"lua: Failed to obtain lua interpreter for %s %s", "lua: Failed to obtain lua interpreter for %s %s",
function_name, filename); function_name, filename);
ap_lua_release_state(L, spec, r); ap_lua_release_state(L, spec, r);
@@ -721,7 +721,7 @@ static int lua_map_handler(request_rec *r)
if (function_name != NULL) { if (function_name != NULL) {
lua_getglobal(L, function_name); lua_getglobal(L, function_name);
if (!lua_isfunction(L, -1)) { if (!lua_isfunction(L, -1)) {
ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(01478) ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(02331)
"lua: Unable to find function %s in %s", "lua: Unable to find function %s in %s",
function_name, function_name,
filename); filename);