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
The following commit(s) were added to refs/heads/8.5.x by this push: new 25549013df Add missing strings 25549013df is described below commit 25549013df5b8ea7db29db3e5a2916599260c475 Author: remm <r...@apache.org> AuthorDate: Tue Feb 6 16:01:43 2024 +0100 Add missing strings --- .../apache/catalina/core/LocalStrings.properties | 1 + java/org/apache/catalina/core/StandardContext.java | 2 +- .../catalina/session/LocalStrings.properties | 5 +++++ .../catalina/session/PersistentManagerBase.java | 2 +- java/org/apache/catalina/session/StoreBase.java | 6 +++--- .../apache/catalina/valves/LocalStrings.properties | 1 + .../apache/catalina/valves/PersistentValve.java | 2 +- java/org/apache/tomcat/util/Diagnostics.java | 24 +++++++++++----------- .../org/apache/tomcat/util/LocalStrings.properties | 2 ++ 9 files changed, 27 insertions(+), 18 deletions(-) diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties index 84fdc9732b..2be22cd18b 100644 --- a/java/org/apache/catalina/core/LocalStrings.properties +++ b/java/org/apache/catalina/core/LocalStrings.properties @@ -233,6 +233,7 @@ standardContext.reloadingCompleted=Reloading Context with name [{0}] is complete standardContext.reloadingStarted=Reloading Context with name [{0}] has started standardContext.requestListener.requestDestroyed=Exception sending request destroyed lifecycle event to listener instance of class [{0}] standardContext.requestListener.requestInit=Exception sending request initialized lifecycle event to listener instance of class [{0}] +standardContext.resetContextFail=Error resetting Context with name [{0}] standardContext.resourcesInit=Error initializing static Resources standardContext.resourcesStart=Error starting static Resources standardContext.resourcesStop=Error stopping static Resources diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 41b9db4ddc..831be22bb4 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -5191,7 +5191,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat try { resetContext(); } catch (Exception ex) { - log.error("Error resetting context " + this + " " + ex, ex); + log.error(sm.getString("standardContext.resetContextFail", getName()), ex); } // reset the instance manager diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties index 499e98e94d..8f0e54e846 100644 --- a/java/org/apache/catalina/session/LocalStrings.properties +++ b/java/org/apache/catalina/session/LocalStrings.properties @@ -49,6 +49,7 @@ persistentManager.backupMaxIdle=Backing up session [{0}] to Store, idle for [{1} persistentManager.deserializeError=Error deserializing Session [{0}] persistentManager.isLoadedError=Error checking if session [{0}] is loaded in memory persistentManager.loading=Loading [{0}] persisted sessions +persistentManager.noStore=No Store configured, persistence disabled persistentManager.removeError=Error removing session [{0}] from the store persistentManager.serializeError=Error serializing Session [{0}]: [{1}] persistentManager.storeClearError=Error clearning all sessions from the store @@ -94,3 +95,7 @@ standardSession.sessionEvent=Session event listener threw exception standardSession.setAttribute.iae=setAttribute: Non-serializable attribute [{0}] standardSession.setAttribute.ise=setAttribute: Session [{0}] has already been invalidated standardSession.setAttribute.namenull=setAttribute: name parameter cannot be null + +store.expireFail=Error processing session expiration for key [{0}] +store.keysFail=Error getting keys +store.removeFail=Error removing key [{0}] diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java index 01e90fa591..c914d2b17a 100644 --- a/java/org/apache/catalina/session/PersistentManagerBase.java +++ b/java/org/apache/catalina/session/PersistentManagerBase.java @@ -830,7 +830,7 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store super.startInternal(); if (store == null) { - log.error("No Store configured, persistence disabled"); + log.error(sm.getString("persistentManager.noStore")); } else if (store instanceof Lifecycle) { ((Lifecycle) store).start(); } diff --git a/java/org/apache/catalina/session/StoreBase.java b/java/org/apache/catalina/session/StoreBase.java index 4c0bc1422d..31ddfe9b70 100644 --- a/java/org/apache/catalina/session/StoreBase.java +++ b/java/org/apache/catalina/session/StoreBase.java @@ -141,7 +141,7 @@ public abstract class StoreBase extends LifecycleBase implements Store { try { keys = expiredKeys(); } catch (IOException e) { - manager.getContext().getLogger().error("Error getting keys", e); + manager.getContext().getLogger().error(sm.getString("store.keysFail"), e); return; } if (manager.getContext().getLogger().isTraceEnabled()) { @@ -186,11 +186,11 @@ public abstract class StoreBase extends LifecycleBase implements Store { } remove(key); } catch (Exception e) { - manager.getContext().getLogger().error("Session: " + key + "; ", e); + manager.getContext().getLogger().error(sm.getString("store.expireFail", key), e); try { remove(key); } catch (IOException e2) { - manager.getContext().getLogger().error("Error removing key", e2); + manager.getContext().getLogger().error(sm.getString("store.removeFail", key), e2); } } } diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties index 091327fe55..247139f0f1 100644 --- a/java/org/apache/catalina/valves/LocalStrings.properties +++ b/java/org/apache/catalina/valves/LocalStrings.properties @@ -135,6 +135,7 @@ persistentValve.acquireInterrupted=The request for [{0}] did not obtain the per persistentValve.filter.failure=Unable to compile filter=[{0}] persistentValve.requestIgnore=The request for [{0}] was ignored by this Valve as it matches the configured filter persistentValve.requestProcess=The request for [{0}] will be processed by this Valve as it does not match the configured filter +persistentValve.sessionLoadFail=Loading session [{0}] from the store failed remoteCidrValve.invalid=Invalid configuration provided for [{0}]. See previous messages for details. remoteCidrValve.noPort=Request does not contain a valid server port. Request denied. diff --git a/java/org/apache/catalina/valves/PersistentValve.java b/java/org/apache/catalina/valves/PersistentValve.java index b6ed022b68..aa418f513c 100644 --- a/java/org/apache/catalina/valves/PersistentValve.java +++ b/java/org/apache/catalina/valves/PersistentValve.java @@ -184,7 +184,7 @@ public class PersistentValve extends ValveBase { try { session = store.load(sessionId); } catch (Exception e) { - containerLog.error("deserializeError"); + containerLog.error(sm.getString("persistentValve.sessionLoadFail", sessionId)); } if (session != null) { if (!session.isValid() || isSessionStale(session, System.currentTimeMillis())) { diff --git a/java/org/apache/tomcat/util/Diagnostics.java b/java/org/apache/tomcat/util/Diagnostics.java index aa07d6a339..77091e5c49 100644 --- a/java/org/apache/tomcat/util/Diagnostics.java +++ b/java/org/apache/tomcat/util/Diagnostics.java @@ -123,8 +123,8 @@ public class Diagnostics { threadMXBean.setThreadContentionMonitoringEnabled(enable); boolean checkValue = threadMXBean.isThreadContentionMonitoringEnabled(); if (enable != checkValue) { - log.error("Could not set threadContentionMonitoringEnabled to " + - enable + ", got " + checkValue + " instead"); + log.error(sm.getString("diagnostics.setPropertyFail", "threadContentionMonitoringEnabled", + Boolean.valueOf(enable), Boolean.valueOf(checkValue))); } } @@ -146,8 +146,8 @@ public class Diagnostics { threadMXBean.setThreadCpuTimeEnabled(enable); boolean checkValue = threadMXBean.isThreadCpuTimeEnabled(); if (enable != checkValue) { - log.error("Could not set threadCpuTimeEnabled to " + enable + - ", got " + checkValue + " instead"); + log.error(sm.getString("diagnostics.setPropertyFail", "threadCpuTimeEnabled", + Boolean.valueOf(enable), Boolean.valueOf(checkValue))); } } @@ -167,8 +167,8 @@ public class Diagnostics { classLoadingMXBean.setVerbose(verbose); boolean checkValue = classLoadingMXBean.isVerbose(); if (verbose != checkValue) { - log.error("Could not set verbose class loading to " + verbose + - ", got " + checkValue + " instead"); + log.error(sm.getString("diagnostics.setPropertyFail", "verboseClassLoading", + Boolean.valueOf(verbose), Boolean.valueOf(checkValue))); } } @@ -182,9 +182,9 @@ public class Diagnostics { loggingMXBean.setLoggerLevel(loggerName, levelName); String checkValue = loggingMXBean.getLoggerLevel(loggerName); if (!checkValue.equals(levelName)) { - log.error("Could not set logger level for logger '" + - loggerName + "' to '" + levelName + - "', got '" + checkValue + "' instead"); + String propertyName = "loggerLevel[" + loggerName + "]"; + log.error(sm.getString("diagnostics.setPropertyFail", propertyName, + levelName, checkValue)); } } @@ -197,8 +197,8 @@ public class Diagnostics { memoryMXBean.setVerbose(verbose); boolean checkValue = memoryMXBean.isVerbose(); if (verbose != checkValue) { - log.error("Could not set verbose garbage collection logging to " + verbose + - ", got " + checkValue + " instead"); + log.error(sm.getString("diagnostics.setPropertyFail", "verboseGarbageCollection", + Boolean.valueOf(verbose), Boolean.valueOf(checkValue))); } } @@ -374,7 +374,7 @@ public class Diagnostics { true, true); if (tinfos != null) { StringBuilder sb = - new StringBuilder("Deadlock found between the following threads:"); + new StringBuilder(sm.getString("diagnostics.deadlockFound")); sb.append(CRLF); sb.append(getThreadDump(tinfos)); return sb.toString(); diff --git a/java/org/apache/tomcat/util/LocalStrings.properties b/java/org/apache/tomcat/util/LocalStrings.properties index 14572ef81b..ce3c7fe571 100644 --- a/java/org/apache/tomcat/util/LocalStrings.properties +++ b/java/org/apache/tomcat/util/LocalStrings.properties @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +diagnostics.deadlockFound=Deadlock found between the following threads: +diagnostics.setPropertyFail=Could not set [{0}] to [{1}], got [{2}] instead diagnostics.threadDumpTitle=Full thread dump diagnostics.vmInfoClassCompilation=Class compilation diagnostics.vmInfoClassLoading=Class loading --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org