Author: remm
Date: Fri Dec 7 13:19:04 2018
New Revision: 1848401
URL: http://svn.apache.org/viewvc?rev=1848401&view=rev
Log:
Add i18n for ha/* packages.
Added:
tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java?rev=1848401&r1=1848400&r2=1848401&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java Fri Dec
7 13:19:04 2018
@@ -27,6 +27,7 @@ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import org.apache.tomcat.util.modeler.Registry;
+import org.apache.tomcat.util.res.StringManager;
/*
* Listener to provider informations to mod_heartbeat.c
@@ -37,6 +38,8 @@ import org.apache.tomcat.util.modeler.Re
*/
public class CollectedInfo {
+ private static final StringManager sm =
StringManager.getManager(CollectedInfo.class);
+
/* Collect info via JMX */
protected MBeanServer mBeanServer = null;
protected ObjectName objName = null;
@@ -90,8 +93,9 @@ public class CollectedInfo {
objName = null;
shost = null;
}
- if (objName == null)
- throw new Exception("Can't find connector for " + host + ":" +
port);
+ if (objName == null) {
+ throw new Exception(sm.getString("collectedInfo.noConnector",
host, port));
+ }
this.port = iport;
this.host = shost;
@@ -99,7 +103,7 @@ public class CollectedInfo {
public void refresh() throws Exception {
if (mBeanServer == null || objName == null) {
- throw new Exception("Not initialized!!!");
+ throw new Exception(sm.getString("collectedInfo.notInitialized"));
}
Integer imax = (Integer) mBeanServer.getAttribute(objName,
"maxThreads");
Modified:
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java?rev=1848401&r1=1848400&r2=1848401&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java Fri
Dec 7 13:19:04 2018
@@ -23,6 +23,7 @@ import org.apache.catalina.LifecycleEven
import org.apache.catalina.LifecycleListener;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/*
* Listener to provider informations to mod_heartbeat.c
@@ -34,6 +35,7 @@ import org.apache.juli.logging.LogFactor
public class HeartbeatListener implements LifecycleListener {
private static final Log log = LogFactory.getLog(HeartbeatListener.class);
+ private static final StringManager sm =
StringManager.getManager(HeartbeatListener.class);
/* To allow to select the connector */
protected int port = 8009;
@@ -178,7 +180,7 @@ public class HeartbeatListener implement
this.port = coll.port;
this.host = coll.host;
} catch (Exception ex) {
- log.error("Unable to initialize info collection: " + ex);
+
log.error(sm.getString("heartbeatListener.errorCollectingInfo"), ex);
coll = null;
return;
}
@@ -188,7 +190,7 @@ public class HeartbeatListener implement
try {
sender.init(this);
} catch (Exception ex) {
- log.error("Unable to initialize Sender: " + ex);
+ log.error(sm.getString("heartbeatListener.senderInitError"),
ex);
sender = null;
return;
}
@@ -197,7 +199,7 @@ public class HeartbeatListener implement
try {
coll.refresh();
} catch (Exception ex) {
- log.error("Unable to collect load information: " + ex);
+ log.error(sm.getString("heartbeatListener.refreshError"), ex);
coll = null;
return;
}
@@ -206,7 +208,7 @@ public class HeartbeatListener implement
try {
sender.send(output);
} catch (Exception ex) {
- log.error("Unable to send collected load information: " + ex);
+ log.error(sm.getString("heartbeatListener.sendError"), ex);
}
}
}
Added: tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings.properties?rev=1848401&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings.properties
(added)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings.properties
Fri Dec 7 13:19:04 2018
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+collectedInfo.noConnector=Cannot find connector for [{0}]:[{1}]
+collectedInfo.notInitialized=Not initialized
+
+heartbeatListener.errorCollectingInfo=Unable to initialize info collection
+heartbeatListener.refreshError=Unable to collect load information
+heartbeatListener.senderInitError=Unable to initialize Sender
+heartbeatListener.sendError=Unable to send collected load information
+
+multiCastSender.multiCastFailed=Unable to use multicast
+multiCastSender.sendFailed=Unable to send collected load information
+
+tcpSender.connectionFailed=Unable to connect to proxy
+tcpSender.invalidProxyList=Invalid proxy list
+tcpSender.notInitialized=Not initialized
+tcpSender.readError=Error reading response content
+tcpSender.responseError=Unable to read response from proxy
+tcpSender.responseErrorCode=Response error with code [{0}]
+tcpSender.sendFailed=Unable to send collected load information to proxy
Propchange:
tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java?rev=1848401&r1=1848400&r2=1848401&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java Fri
Dec 7 13:19:04 2018
@@ -26,6 +26,7 @@ import java.nio.charset.StandardCharsets
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/*
* Sender to proxies using multicast socket.
@@ -34,6 +35,7 @@ public class MultiCastSender
implements Sender {
private static final Log log = LogFactory.getLog(HeartbeatListener.class);
+ private static final StringManager sm =
StringManager.getManager(MultiCastSender.class);
HeartbeatListener config = null;
@@ -61,7 +63,7 @@ public class MultiCastSender
s.setTimeToLive(config.getTtl());
s.joinGroup(group);
} catch (Exception ex) {
- log.error("Unable to use multicast: " + ex);
+ log.error(sm.getString("multiCastSender.multiCastFailed"), ex);
s = null;
return -1;
}
@@ -73,7 +75,7 @@ public class MultiCastSender
try {
s.send(data);
} catch (Exception ex) {
- log.error("Unable to send collected load information: " + ex);
+ log.error(sm.getString("multiCastSender.sendFailed"), ex);
s.close();
s = null;
return -1;
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java?rev=1848401&r1=1848400&r2=1848401&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java Fri Dec 7
13:19:04 2018
@@ -30,6 +30,7 @@ import java.util.StringTokenizer;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/*
* Sender to proxies using multicast socket.
@@ -38,6 +39,7 @@ public class TcpSender
implements Sender {
private static final Log log = LogFactory.getLog(HeartbeatListener.class);
+ private static final StringManager sm =
StringManager.getManager(TcpSender.class);
HeartbeatListener config = null;
@@ -65,14 +67,15 @@ public class TcpSender
while (tok.hasMoreTokens()) {
String token = tok.nextToken().trim();
int pos = token.indexOf(':');
- if (pos <=0)
- throw new Exception("bad ProxyList");
+ if (pos <= 0) {
+ throw new
Exception(sm.getString("tcpSender.invalidProxyList"));
+ }
proxies[i] = new Proxy();
proxies[i].port = Integer.parseInt(token.substring(pos + 1));
try {
proxies[i].address = InetAddress.getByName(token.substring(0,
pos));
} catch (Exception e) {
- throw new Exception("bad ProxyList");
+ throw new
Exception(sm.getString("tcpSender.invalidProxyList"));
}
i++;
}
@@ -85,7 +88,7 @@ public class TcpSender
@Override
public int send(String mess) throws Exception {
if (connections == null) {
- log.error("Not initialized");
+ log.error(sm.getString("tcpSender.notInitialized"));
return -1;
}
String requestLine = "POST " + config.getProxyURL() + " HTTP/1.0";
@@ -106,7 +109,7 @@ public class TcpSender
connectionReaders[i] = new BufferedReader(new
InputStreamReader(connections[i].getInputStream()));
connectionWriters[i] = new BufferedWriter(new
OutputStreamWriter(connections[i].getOutputStream()));
} catch (Exception ex) {
- log.error("Unable to connect to proxy: " + ex);
+ log.error(sm.getString("tcpSender.connectionFailed"), ex);
close(i);
}
}
@@ -124,7 +127,7 @@ public class TcpSender
writer.write("\r\n");
writer.flush();
} catch (Exception ex) {
- log.error("Unable to send collected load information to proxy:
" + ex);
+ log.error(sm.getString("tcpSender.sendFailed"), ex);
close(i);
}
if (connections[i] == null)
@@ -133,14 +136,14 @@ public class TcpSender
/* Read httpd answer */
String responseStatus = connectionReaders[i].readLine();
if (responseStatus == null) {
- log.error("Unable to read response from proxy");
+ log.error(sm.getString("tcpSender.responseError"));
close(i);
continue;
} else {
responseStatus =
responseStatus.substring(responseStatus.indexOf(' ') + 1,
responseStatus.indexOf(' ', responseStatus.indexOf(' ') + 1));
int status = Integer.parseInt(responseStatus);
if (status != 200) {
- log.error("Status is " + status);
+ log.error(sm.getString("tcpSender.responseErrorCode",
status));
close(i);
continue;
}
@@ -163,7 +166,7 @@ public class TcpSender
int thisTime = (contentLength > buf.length) ?
buf.length : contentLength;
int n = connectionReaders[i].read(buf, 0, thisTime);
if (n <= 0) {
- log.error("Read content failed");
+ log.error(sm.getString("tcpSender.readError"));
close(i);
break;
} else {
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1848401&r1=1848400&r2=1848401&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Fri
Dec 7 13:19:04 2018
@@ -250,7 +250,7 @@ public class FarmWarDeployer extends Clu
"farmWarDeployer.servicingDeploy",
contextName, name));
} catch (Exception ex) {
- log.error(ex);
+
log.error(sm.getString("farmWarDeployer.fileMessageError"), ex);
} finally {
removeFactory(fmsg);
}
@@ -278,7 +278,7 @@ public class FarmWarDeployer extends Clu
"farmWarDeployer.servicingUndeploy",
contextName));
} catch (Exception ex) {
- log.error(ex);
+
log.error(sm.getString("farmWarDeployer.undeployMessageError"), ex);
}
}
} catch (java.io.IOException x) {
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=1848401&r1=1848400&r2=1848401&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java Fri
Dec 7 13:19:04 2018
@@ -235,36 +235,26 @@ public class FileMessageFactory {
*/
public boolean writeMessage(FileMessage msg)
throws IllegalArgumentException, IOException {
- if (!openForWrite)
- throw new IllegalArgumentException(
- "Can't write message, this factory is reading.");
+ if (!openForWrite) {
+ throw new
IllegalArgumentException(sm.getString("fileMessageFactory.cannotWrite"));
+ }
if (log.isDebugEnabled())
log.debug("Message " + msg + " data " +
HexUtils.toHexString(msg.getData())
+ " data length " + msg.getDataLength() + " out " + out);
if (msg.getMessageNumber() <= lastMessageProcessed.get()) {
// Duplicate of message already processed
- log.warn("Receive Message again -- Sender ActTimeout too short [
name: "
- + msg.getContextName()
- + " war: "
- + msg.getFileName()
- + " data: "
- + HexUtils.toHexString(msg.getData())
- + " data length: " + msg.getDataLength() + " ]");
+ log.warn(sm.getString("fileMessageFactory.duplicateMessage",
msg.getContextName(), msg.getFileName(),
+ HexUtils.toHexString(msg.getData()), msg.getDataLength()));
return false;
}
FileMessage previous =
msgBuffer.put(Long.valueOf(msg.getMessageNumber()), msg);
- if (previous !=null) {
+ if (previous != null) {
// Duplicate of message not yet processed
- log.warn("Receive Message again -- Sender ActTimeout too short [
name: "
- + msg.getContextName()
- + " war: "
- + msg.getFileName()
- + " data: "
- + HexUtils.toHexString(msg.getData())
- + " data length: " + msg.getDataLength() + " ]");
+ log.warn(sm.getString("fileMessageFactory.duplicateMessage",
msg.getContextName(), msg.getFileName(),
+ HexUtils.toHexString(msg.getData()), msg.getDataLength()));
return false;
}
@@ -340,16 +330,15 @@ public class FileMessageFactory {
throws IllegalArgumentException {
if (this.openForWrite != openForWrite) {
cleanup();
- if (openForWrite)
- throw new IllegalArgumentException(
- "Can't write message, this factory is reading.");
- else
- throw new IllegalArgumentException(
- "Can't read message, this factory is writing.");
+ if (openForWrite) {
+ throw new
IllegalArgumentException(sm.getString("fileMessageFactory.cannotWrite"));
+ } else {
+ throw new
IllegalArgumentException(sm.getString("fileMessageFactory.cannotRead"));
+ }
}
if (this.closed) {
cleanup();
- throw new IllegalArgumentException("Factory has been closed.");
+ throw new
IllegalArgumentException(sm.getString("fileMessageFactory.closed"));
}
}
@@ -360,13 +349,11 @@ public class FileMessageFactory {
* String[], args[0] - read from filename, args[1] write to
* filename
* @throws Exception An error occurred
+ * @deprecated
*/
public static void main(String[] args) throws Exception {
-
- System.out
- .println("Usage: FileMessageFactory fileToBeRead
fileToBeWritten");
- System.out
- .println("Usage: This will make a copy of the file on the
local file system");
+ System.out.println("Usage: FileMessageFactory fileToBeRead
fileToBeWritten");
+ System.out.println("Usage: This will make a copy of the file on the
local file system");
FileMessageFactory read = getInstance(new File(args[0]), false);
FileMessageFactory write = getInstance(new File(args[1]), true);
FileMessage msg = new FileMessage(null, args[0], args[0]);
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties?rev=1848401&r1=1848400&r2=1848401&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
[UTF-8] Fri Dec 7 13:19:04 2018
@@ -17,6 +17,7 @@ farmWarDeployer.alreadyDeployed=webapp [
farmWarDeployer.deleteFail=Failed to delete [{0}]
farmWarDeployer.deployEnd=Deployment from [{0}] finished.
farmWarDeployer.fileCopyFail=Unable to copy from [{0}] to [{1}]
+farmWarDeployer.fileMessageError=Error processing file message
farmWarDeployer.hostOnly=FarmWarDeployer can only work as host cluster
subelement!
farmWarDeployer.hostParentEngine=FarmWarDeployer can only work if parent of
[{0}] is an engine!
farmWarDeployer.mbeanNameFail=Cannot construct MBean object name for engine
[{0}] and host [{1}]
@@ -42,9 +43,14 @@ farmWarDeployer.started=Cluster FarmWarD
farmWarDeployer.stopped=Cluster FarmWarDeployer stopped.
farmWarDeployer.undeployEnd=Undeployment from [{0}] finished.
farmWarDeployer.undeployLocal=Undeploy local context [{0}]
+farmWarDeployer.undeployMessageError=Error processing undeploy message
farmWarDeployer.watchDir=Cluster deployment is watching [{0}] for changes.
+fileMessageFactory.cannotRead=Cannot read message, this factory is writing
+fileMessageFactory.cannotWrite=Cannot write message, this factory is reading
+fileMessageFactory.closed=Factory has been closed
fileMessageFactory.deleteFail=Failed to delete [{0}]
+fileMessageFactory.duplicateMessage=Receive Message again, sender ActTimeout
too short; name: [{0}] war: [{1}] data: [{2}] data length: [{3}]
fileNewFail=Unable to create [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
