Author: markt Date: Fri Jan 6 21:54:14 2017 New Revision: 1777721 URL: http://svn.apache.org/viewvc?rev=1777721&view=rev Log: Improve debug logging for tracking Processor usage
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java tomcat/trunk/java/org/apache/coyote/LocalStrings.properties Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1777721&r1=1777720&r2=1777721&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Jan 6 21:54:14 2017 @@ -691,6 +691,11 @@ public abstract class AbstractProtocol<S S socket = wrapper.getSocket(); Processor processor = connections.get(socket); + if (getLog().isDebugEnabled()) { + getLog().debug(sm.getString("abstractConnectionHandler.connectionsGet", + processor, socket)); + } + if (processor != null) { // Make sure an async timeout doesn't fire getProtocol().removeWaitingProcessor(processor); @@ -741,6 +746,10 @@ public abstract class AbstractProtocol<S } if (processor == null) { processor = recycledProcessors.pop(); + if (getLog().isDebugEnabled()) { + getLog().debug(sm.getString("abstractConnectionHandler.processorPop", + processor)); + } } if (processor == null) { processor = getProtocol().createProcessor(); @@ -785,6 +794,10 @@ public abstract class AbstractProtocol<S release(processor); // Create the upgrade processor processor = getProtocol().createUpgradeProcessor(wrapper, upgradeToken); + if (getLog().isDebugEnabled()) { + getLog().debug(sm.getString("abstractConnectionHandler.upgradeCreate", + processor, wrapper)); + } wrapper.unRead(leftOverInput); // Mark the connection as upgraded wrapper.setUpgraded(true); @@ -938,6 +951,7 @@ public abstract class AbstractProtocol<S // processors if (!processor.isUpgrade()) { recycledProcessors.push(processor); + getLog().debug("Pushed Processor [" + processor + "]"); } } } Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1777721&r1=1777720&r2=1777721&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties Fri Jan 6 21:54:14 2017 @@ -12,12 +12,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +abstractConnectionHandler.connectionsGet=Found processor [{0}] for socket [{1}] abstractConnectionHandler.error=Error reading request, ignored abstractConnectionHandler.ioexception.debug=IOExceptions are normal, ignored abstractConnectionHandler.process=Processing socket [{0}] with status [{1}] +abstractConnectionHandler.processorPop=Popped processor [{0}] from cache abstractConnectionHandler.protocolexception.debug=ProtocolExceptions are normal, ignored abstractConnectionHandler.socketexception.debug=SocketExceptions are normal, ignored abstractConnectionHandler.negotiatedProcessor.fail=Failed to create Processor for negotiated protocol [{0}] +abstractConnectionHandler.upgradeCreate=Created upgrade processor [{0}] for socket wrapper [{1}] abstractProcessor.httpupgrade.notsupported=HTTP upgrade is not supported by this protocol abstractProcessor.noExecute=Unable to transfer processing to a container thread because this Processor is not currently associated with a SocketWrapper --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org