]> granicus.if.org Git - apache/commitdiff
Replace duplicate log msg numbers
authorStefan Fritsch <sf@apache.org>
Mon, 10 Sep 2012 18:06:48 +0000 (18:06 +0000)
committerStefan Fritsch <sf@apache.org>
Mon, 10 Sep 2012 18:06:48 +0000 (18:06 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383013 13f79535-47bb-0310-9956-ffa450edef68

docs/log-message-tags/next-number
modules/lua/lua_vmprep.c
modules/lua/mod_lua.c

index ffcd151c41f04a9e5519a52ef27163b83e0b94c9..f5052a2a281455763b0613a8fe2bb73324f8e51f 100644 (file)
@@ -1 +1 @@
-2328
+2334
index faa0afc05269a1ca8a22f0cfd05692d9dd2a88c0..02d030fbfb7e2d32c2bb7359023060bdad40e813 100644 (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) {
         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);
         rc = luaL_loadfile(L, spec->file);
         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,
                           rc == LUA_ERRMEM ? "memory allocation error"
                                            : lua_tostring(L, 0));
index e75ca32ddf17b56b42be1703bf6e7a64e1a07c59..22620b5da97647279779d9171bb493f4283f9009 100644 (file)
@@ -336,7 +336,7 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil
             }
 
             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",
                                 hook_spec->function_name, hook_spec->file_name);
                 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) {
                 lua_getglobal(L, hook_spec->function_name);
                 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",
                                     hook_spec->function_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);
 
             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",
                                 function_name, filename);
                 ap_lua_release_state(L, spec, r);
@@ -721,7 +721,7 @@ static int lua_map_handler(request_rec *r)
             if (function_name != NULL) {
                 lua_getglobal(L, function_name);
                 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",
                                     function_name,
                                     filename);