You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2019/10/30 17:52:19 UTC
[tomcat] branch 8.5.x updated (cf53f8a -> d97f33b)
This is an automated email from the ASF dual-hosted git repository.
remm pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from cf53f8a Remove unnecessary code
new 80aaff5 Add missing i18n
new d97f33b Log tweaks
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/coyote/AbstractProtocol.java | 10 ++++++----
java/org/apache/coyote/LocalStrings.properties | 2 ++
2 files changed, 8 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Add missing i18n
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 80aaff53e1ecbf511fbf0b0284799f4f018eff2f
Author: remm <re...@apache.org>
AuthorDate: Wed Oct 30 11:03:55 2019 +0100
Add missing i18n
---
java/org/apache/coyote/AbstractProtocol.java | 4 ++--
java/org/apache/coyote/LocalStrings.properties | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java
index 0171ff5..3c06d91 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -1037,7 +1037,7 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler,
rpName, null);
rp.setRpName(rpName);
} catch (Exception e) {
- getLog().warn("Error registering request");
+ getLog().warn(sm.getString("abstractProtocol.processorRegisterError"), e);
}
}
}
@@ -1062,7 +1062,7 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler,
rpName);
rp.setRpName(null);
} catch (Exception e) {
- getLog().warn("Error unregistering request", e);
+ getLog().warn(sm.getString("abstractProtocol.processorUnregisterError"), e);
}
}
}
diff --git a/java/org/apache/coyote/LocalStrings.properties b/java/org/apache/coyote/LocalStrings.properties
index 3f0fbdf..29d2e41 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -31,6 +31,8 @@ abstractProcessor.pushrequest.notsupported=Server push requests are not supporte
abstractProcessor.socket.ssl=Exception getting SSL attributes
abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named [{0}] from MBean server [{1}]
+abstractProtocol.processorRegisterError=Error registering request processor
+abstractProtocol.processorUnregisterError=Error unregistering request processor
abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]
abstractProtocolHandler.destroyError=Failed to destroy end point associated with ProtocolHandler [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Log tweaks
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d97f33b259dc6b74c54ec35127ad5b3d39637863
Author: remm <re...@apache.org>
AuthorDate: Wed Oct 30 18:49:35 2019 +0100
Log tweaks
---
java/org/apache/coyote/AbstractProtocol.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java
index 3c06d91..be2bd40 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -998,7 +998,9 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler,
// processors
if (!processor.isUpgrade()) {
recycledProcessors.push(processor);
- getLog().debug("Pushed Processor [" + processor + "]");
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("Pushed Processor [" + processor + "]");
+ }
}
}
}
@@ -1056,7 +1058,7 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler,
rp.setGlobalProcessor(null);
ObjectName rpName = rp.getRpName();
if (getLog().isDebugEnabled()) {
- getLog().debug("Unregister " + rpName);
+ getLog().debug("Unregister [" + rpName + "]");
}
Registry.getRegistry(null, null).unregisterComponent(
rpName);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org