Author: kfujino
Date: Mon May 18 05:16:20 2015
New Revision: 1679937
URL: http://svn.apache.org/r1679937
Log:
Use StringManager to provide i18n support in org.apache.catalina.ha.tcp package
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties?rev=1679937&r1=1679936&r2=1679937&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties Mon
May 18 05:16:20 2015
@@ -28,4 +28,14 @@ ReplicationValve.session.found=Context {
ReplicationValve.session.indicator=Context {0}: Primarity of session {0} in
request attribute {1} is {2}.
ReplicationValve.session.invalid=Context {0}: Requested session {1} is
invalid, removed or not replicated at this node.
ReplicationValve.stats=Average request time= {0} ms for Cluster overhead
time={1} ms for {2} requests {3} filter requests {4} send requests {5} cross
context requests (Request={6} ms Cluster={7} ms).
-
+simpleTcpCluster.clustermanager.cloneFailed=Unable to clone cluster manager,
defaulting to org.apache.catalina.ha.session.DeltaManager
+simpleTcpCluster.clustermanager.notImplement=Manager [{0}] does not implement
ClusterManager, addition to cluster has been aborted.
+simpleTcpCluster.start=Cluster is about to start
+simpleTcpCluster.startUnable=Unable to start cluster.
+simpleTcpCluster.stopUnable=Unable to stop cluster.
+simpleTcpCluster.unableSend.localMember=Unable to send message to local member
{0}
+simpleTcpCluster.sendFailed=Unable to send message through cluster sender.
+simpleTcpCluster.member.added=Replication member added:{0}
+simpleTcpCluster.member.addFailed=Unable to connect to replication system.
+simpleTcpCluster.member.disappeared=Received member disappeared:{0}
+simpleTcpCluster.member.removeFailed=Unable remove cluster node from
replication system.
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1679937&r1=1679936&r2=1679937&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Mon May
18 05:16:20 2015
@@ -406,7 +406,7 @@ public class SimpleTcpCluster extends Li
manager = managerTemplate.cloneFromTemplate();
manager.setName(name);
} catch (Exception x) {
- log.error("Unable to clone cluster manager, defaulting to
org.apache.catalina.ha.session.DeltaManager", x);
+
log.error(sm.getString("simpleTcpCluster.clustermanager.cloneFailed"), x);
manager = new org.apache.catalina.ha.session.DeltaManager();
} finally {
if ( manager != null) manager.setCluster(this);
@@ -418,7 +418,7 @@ public class SimpleTcpCluster extends Li
public void registerManager(Manager manager) {
if (! (manager instanceof ClusterManager)) {
- log.warn("Manager [ " + manager + "] does not implement
ClusterManager, addition to cluster has been aborted.");
+
log.warn(sm.getString("simpleTcpCluster.clustermanager.notImplement", manager));
return;
}
ClusterManager cmanager = (ClusterManager) manager ;
@@ -534,7 +534,7 @@ public class SimpleTcpCluster extends Li
@Override
protected void startInternal() throws LifecycleException {
- if (log.isInfoEnabled()) log.info("Cluster is about to start");
+ if (log.isInfoEnabled())
log.info(sm.getString("simpleTcpCluster.start"));
try {
checkDefaults();
@@ -545,7 +545,7 @@ public class SimpleTcpCluster extends Li
if (clusterDeployer != null) clusterDeployer.start();
registerMember(channel.getLocalMember(false));
} catch (Exception x) {
- log.error("Unable to start cluster.", x);
+ log.error(sm.getString("simpleTcpCluster.startUnable"), x);
throw new LifecycleException(x);
}
@@ -625,7 +625,7 @@ public class SimpleTcpCluster extends Li
channel.removeMembershipListener(this);
this.unregisterClusterValve();
} catch (Exception x) {
- log.error("Unable to stop cluster.", x);
+ log.error(sm.getString("simpleTcpCluster.stopUnable"), x);
}
}
@@ -689,7 +689,7 @@ public class SimpleTcpCluster extends Li
if (!getLocalMember().equals(dest)) {
channel.send(new Member[] {dest}, msg, sendOptions);
} else
- log.error("Unable to send message to local member " + msg);
+
log.error(sm.getString("simpleTcpCluster.unableSend.localMember", msg));
} else {
Member[] destmembers = channel.getMembers();
if (destmembers.length>0)
@@ -698,7 +698,7 @@ public class SimpleTcpCluster extends Li
log.debug("No members in cluster, ignoring message:"+msg);
}
} catch (Exception x) {
- log.error("Unable to send message through cluster sender.", x);
+ log.error(sm.getString("simpleTcpCluster.sendFailed"), x);
}
}
@@ -711,7 +711,7 @@ public class SimpleTcpCluster extends Li
public void memberAdded(Member member) {
try {
hasMembers = channel.hasMembers();
- if (log.isInfoEnabled()) log.info("Replication member added:" +
member);
+ if (log.isInfoEnabled())
log.info(sm.getString("simpleTcpCluster.member.added", member));
// Notify our interested LifecycleListeners
fireLifecycleEvent(BEFORE_MEMBERREGISTER_EVENT, member);
@@ -720,7 +720,7 @@ public class SimpleTcpCluster extends Li
// Notify our interested LifecycleListeners
fireLifecycleEvent(AFTER_MEMBERREGISTER_EVENT, member);
} catch (Exception x) {
- log.error("Unable to connect to replication system.", x);
+ log.error(sm.getString("simpleTcpCluster.member.addFailed"), x);
}
}
@@ -734,7 +734,7 @@ public class SimpleTcpCluster extends Li
public void memberDisappeared(Member member) {
try {
hasMembers = channel.hasMembers();
- if (log.isInfoEnabled()) log.info("Received member disappeared:" +
member);
+ if (log.isInfoEnabled())
log.info(sm.getString("simpleTcpCluster.member.disappeared", member));
// Notify our interested LifecycleListeners
fireLifecycleEvent(BEFORE_MEMBERUNREGISTER_EVENT, member);
@@ -743,7 +743,7 @@ public class SimpleTcpCluster extends Li
// Notify our interested LifecycleListeners
fireLifecycleEvent(AFTER_MEMBERUNREGISTER_EVENT, member);
} catch (Exception x) {
- log.error("Unable remove cluster node from replication system.",
x);
+ log.error(sm.getString("simpleTcpCluster.member.removeFailed"), x);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
