tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1867890 - in /tomcat/jk/trunk: native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml
Date Wed, 02 Oct 2019 14:56:48 GMT
Author: markt
Date: Wed Oct  2 14:56:48 2019
New Revision: 1867890

URL: http://svn.apache.org/viewvc?rev=1867890&view=rev
Log:
Extend trace level logging of method entry/exit to aid debugging of request mapping issues.

Modified:
    tomcat/jk/trunk/native/apache-2.0/mod_jk.c
    tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1867890&r1=1867889&r2=1867890&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Wed Oct  2 14:56:48 2019
@@ -2793,6 +2793,7 @@ static int jk_handler(request_rec * r)
                 clean_uri = apr_pstrdup(r->pool, r->uri);
                 rc = jk_servlet_normalize(clean_uri, xconf->log);
                 if (rc != 0) {
+                    JK_TRACE_EXIT(xconf->log);
                     return HTTP_BAD_REQUEST;
                 }
 
@@ -3788,6 +3789,8 @@ static int jk_translate(request_rec * r)
             int rc;
             const char *worker;
 
+            JK_TRACE_ENTER(conf->log);
+
             if ((r->handler != NULL) && (!strcmp(r->handler, JK_HANDLER)))
{
                 /* Somebody already set the handler, probably manual config
                  * or "native" configuration, no need for extra overhead
@@ -3795,6 +3798,7 @@ static int jk_translate(request_rec * r)
                 if (JK_IS_DEBUG_LEVEL(conf->log))
                     jk_log(conf->log, JK_LOG_DEBUG,
                            "Manually mapped, no need to call uri_to_worker");
+                JK_TRACE_EXIT(conf->log);
                 return DECLINED;
             }
 
@@ -3804,12 +3808,14 @@ static int jk_translate(request_rec * r)
                            "Into translate no-jk env var detected for uri=%s, declined",
                            r->uri);
 
+                JK_TRACE_EXIT(conf->log);
                 return DECLINED;
             }
 
             clean_uri = apr_pstrdup(r->pool, r->uri);
             rc = jk_servlet_normalize(clean_uri, conf->log);
             if (rc != 0) {
+                JK_TRACE_EXIT(conf->log);
                 return HTTP_BAD_REQUEST;
             }
 
@@ -3842,6 +3848,7 @@ static int jk_translate(request_rec * r)
                         jk_log(conf->log, JK_LOG_DEBUG,
                                "JkAutoAlias, no DirectoryIndex file for URI %s",
                                r->uri);
+                    JK_TRACE_EXIT(conf->log);
                     return DECLINED;
                 }
             }
@@ -3851,6 +3858,7 @@ static int jk_translate(request_rec * r)
                            "missing uri map for %s:%s",
                            conf->s->server_hostname ? conf->s->server_hostname
: "_default_",
                            r->uri);
+                JK_TRACE_EXIT(conf->log);
                 return DECLINED;
             }
             else {
@@ -3875,6 +3883,7 @@ static int jk_translate(request_rec * r)
                     apr_table_setn(r->main->notes, JK_NOTE_WORKER_NAME, worker);
                 }
 
+                JK_TRACE_EXIT(conf->log);
                 return OK;
             }
             else if (conf->alias_dir != NULL) {
@@ -3915,6 +3924,7 @@ static int jk_translate(request_rec * r)
                                     jk_log(conf->log, JK_LOG_DEBUG,
                                            "AutoAlias HTTP_NOT_FOUND for URI: %s",
                                            r->uri);
+                                JK_TRACE_EXIT(conf->log);
                                 return HTTP_NOT_FOUND;
                             }
                         }
@@ -3945,6 +3955,7 @@ static int jk_translate(request_rec * r)
                                            "AutoAlias OK for file: %s",
                                            ret);
                                 r->filename = ret;
+                                JK_TRACE_EXIT(conf->log);
                                 return OK;
                             }
                         }
@@ -3958,6 +3969,7 @@ static int jk_translate(request_rec * r)
                                     jk_log(conf->log, JK_LOG_DEBUG,
                                            "AutoAlias HTTP_FORBIDDEN for URI: %s",
                                            r->uri);
+                                JK_TRACE_EXIT(conf->log);
                                 return HTTP_FORBIDDEN;
                             }
                         }
@@ -4000,6 +4012,8 @@ static int jk_map_to_storage(request_rec
             int rc;
             const char *worker;
 
+            JK_TRACE_ENTER(conf->log);
+
             if ((r->handler != NULL) && (!strcmp(r->handler, JK_HANDLER)))
{
                 /* Somebody already set the handler, probably manual config
                  * or "native" configuration, no need for extra overhead
@@ -4007,6 +4021,7 @@ static int jk_map_to_storage(request_rec
                 if (JK_IS_DEBUG_LEVEL(conf->log))
                     jk_log(conf->log, JK_LOG_DEBUG,
                            "Manually mapped, no need to call uri_to_worker");
+                JK_TRACE_EXIT(conf->log);
                 return DECLINED;
             }
 
@@ -4016,12 +4031,14 @@ static int jk_map_to_storage(request_rec
                            "Into map_to_storage no-jk env var detected for uri=%s, declined",
                            r->uri);
 
+                JK_TRACE_EXIT(conf->log);
                 return DECLINED;
             }
 
             clean_uri = apr_pstrdup(r->pool, r->uri);
             rc = jk_servlet_normalize(clean_uri, conf->log);
             if (rc != 0) {
+                JK_TRACE_EXIT(conf->log);
                 return HTTP_BAD_REQUEST;
             }
 
@@ -4031,6 +4048,7 @@ static int jk_map_to_storage(request_rec
                            "missing uri map for %s:%s",
                            conf->s->server_hostname ? conf->s->server_hostname
: "_default_",
                            r->uri);
+                JK_TRACE_EXIT(conf->log);
                 return DECLINED;
             }
             else {
@@ -4065,9 +4083,11 @@ static int jk_map_to_storage(request_rec
                     if (r->filename) {
                         jk_strip_session_id(r->filename, conf->strip_session_name,
conf->log);
                     }
+                    JK_TRACE_EXIT(conf->log);
                     return DECLINED;
                 }
             }
+		JK_TRACE_EXIT(conf->log);
         }
     }
 

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1867890&r1=1867889&r2=1867890&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Oct  2 14:56:48 2019
@@ -43,6 +43,10 @@
 <section name="Changes between 1.2.46 and 1.2.47">
   <subsection name="Native">
     <changelog>
+      <add>
+        Extend trace level logging of method entry/exit to aid debugging of
+        request mapping issues. (markt)
+      </add>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message