[hornetq-commits] JBoss hornetq SVN: r12292 - in branches/i18n_logging: distribution/hornetq/src/main/resources/bin and 13 other directories.

Author: ataylor Date: 2012-03-13 03:59:26 -0400 (Tue, 13 Mar 2012) New Revision: 12292 Added: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQLogger.java branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQMessageBundle.java branches/i18n_logging/hornetq-core/src/main/resources/org/ branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/ branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/ branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/ branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/impl/ branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/impl/HornetQLogger.i18n_fr.properties branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/impl/HornetQMessageBundle.i18n_fr.properties Modified: branches/i18n_logging/distribution/hornetq/src/main/resources/bin/run.sh branches/i18n_logging/distribution/hornetq/src/main/resources/config/stand-alone/clustered/logging.properties branches/i18n_logging/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/logging.properties branches/i18n_logging/distribution/jboss-mc/pom.xml branches/i18n_logging/distribution/jnp-client/pom.xml branches/i18n_logging/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQException.java branches/i18n_logging/hornetq-core/pom.xml branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java branches/i18n_logging/pom.xml Log: first pass at logging prototype Modified: branches/i18n_logging/distribution/hornetq/src/main/resources/bin/run.sh =================================================================== --- branches/i18n_logging/distribution/hornetq/src/main/resources/bin/run.sh 2012-03-12 22:06:40 UTC (rev 12291) +++ branches/i18n_logging/distribution/hornetq/src/main/resources/bin/run.sh 2012-03-13 07:59:26 UTC (rev 12292) @@ -10,8 +10,8 @@ export CLASSPATH=$CONFIG_DIR:$HORNETQ_HOME/schemas/ #you can use the following line if you want to run with different ports #export CLUSTER_PROPS="-Djnp.port=1099 -Djnp.rmiPort=1098 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5445" -export JVM_ARGS="$CLUSTER_PROPS -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dhornetq.config.dir=$CONFIG_DIR -Djava.util.logging.config.file=$CONFIG_DIR/logging.properties -Djava.library.path=." -#export JVM_ARGS="-Xmx512M -Djava.util.logging.config.file=$CONFIG_DIR/logging.properties -Dhornetq.config.dir=$CONFIG_DIR -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" +export JVM_ARGS="$CLUSTER_PROPS -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dhornetq.config.dir=$CONFIG_DIR -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=$CONFIG_DIR/logging.properties -Djava.library.path=." +#export JVM_ARGS="-Xmx512M -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=$CONFIG_DIR/logging.properties -Dhornetq.config.dir=$CONFIG_DIR -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" for i in `ls $HORNETQ_HOME/lib/*.jar`; do CLASSPATH=$i:$CLASSPATH @@ -20,4 +20,4 @@ echo "***********************************************************************************" echo "java $JVM_ARGS -classpath $CLASSPATH org.hornetq.integration.bootstrap.HornetQBootstrapServer $FILENAME" echo "***********************************************************************************" -java $JVM_ARGS -classpath $CLASSPATH -Dcom.sun.management.jmxremote org.hornetq.integration.bootstrap.HornetQBootstrapServer $FILENAME \ No newline at end of file +java $JVM_ARGS -classpath $CLASSPATH -Dcom.sun.management.jmxremote org.hornetq.integration.bootstrap.HornetQBootstrapServer $FILENAME Modified: branches/i18n_logging/distribution/hornetq/src/main/resources/config/stand-alone/clustered/logging.properties =================================================================== --- branches/i18n_logging/distribution/hornetq/src/main/resources/config/stand-alone/clustered/logging.properties 2012-03-12 22:06:40 UTC (rev 12291) +++ branches/i18n_logging/distribution/hornetq/src/main/resources/config/stand-alone/clustered/logging.properties 2012-03-13 07:59:26 UTC (rev 12292) @@ -1,34 +1,49 @@ -############################################################ -# Default Logging Configuration File # -# You can use a different file by specifying a filename -# with the java.util.logging.config.file system property. -# For example java -Djava.util.logging.config.file=myfile -############################################################ +# JBoss, Home of Professional Open Source. +# Copyright 2010, Red Hat, Inc., and individual contributors +# as indicated by the @author tags. See the copyright.txt file in the +# distribution for a full listing of individual contributors. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# -############################################################ -# Global properties -############################################################ +# Dump system environment at boot by default +logger.org.jboss.as.config.level=INFO -# "handlers" specifies a comma separated list of log Handler -# classes. These handlers will be installed during VM startup. -# Note that these classes must be on the system classpath. -# By default we only configure a ConsoleHandler, which will only -# show messages at the INFO and above levels. -handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler -java.util.logging.ConsoleHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter -java.util.logging.FileHandler.level=INFO -java.util.logging.FileHandler.pattern=../logs/hornetq.log -java.util.logging.FileHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter -# Default global logging level. -# This specifies which kinds of events are logged across -# all loggers. For any given facility this global level -# can be overriden by a facility specific level -# Note that the ConsoleHandler also has a separate level -# setting to limit messages printed to the console. -.level= INFO +# Root logger level +logger.level=INFO +# Root logger handlers +logger.handlers=FILE,CONSOLE -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ +# Console handler configuration +handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler +handler.CONSOLE.properties=autoFlush +handler.CONSOLE.level=INFO +handler.CONSOLE.autoFlush=true +handler.CONSOLE.formatter=PATTERN + +# File handler configuration +handler.FILE=org.jboss.logmanager.handlers.FileHandler +handler.FILE.level=INFO +handler.FILE.properties=autoFlush,fileName +handler.FILE.autoFlush=true +handler.FILE.fileName=boot.log +handler.FILE.formatter=PATTERN + +# Formatter pattern configuration +formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter +formatter.PATTERN.properties=pattern +formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n Modified: branches/i18n_logging/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/logging.properties =================================================================== --- branches/i18n_logging/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/logging.properties 2012-03-12 22:06:40 UTC (rev 12291) +++ branches/i18n_logging/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/logging.properties 2012-03-13 07:59:26 UTC (rev 12292) @@ -1,34 +1,49 @@ -############################################################ -# Default Logging Configuration File # -# You can use a different file by specifying a filename -# with the java.util.logging.config.file system property. -# For example java -Djava.util.logging.config.file=myfile -############################################################ +# JBoss, Home of Professional Open Source. +# Copyright 2010, Red Hat, Inc., and individual contributors +# as indicated by the @author tags. See the copyright.txt file in the +# distribution for a full listing of individual contributors. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# -############################################################ -# Global properties -############################################################ +# Dump system environment at boot by default +logger.org.jboss.as.config.level=INFO -# "handlers" specifies a comma separated list of log Handler -# classes. These handlers will be installed during VM startup. -# Note that these classes must be on the system classpath. -# By default we only configure a ConsoleHandler, which will only -# show messages at the INFO and above levels. -handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler -java.util.logging.ConsoleHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter -java.util.logging.FileHandler.level=INFO -java.util.logging.FileHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter -java.util.logging.FileHandler.pattern=../logs/hornetq.log -# Default global logging level. -# This specifies which kinds of events are logged across -# all loggers. For any given facility this global level -# can be overriden by a facility specific level -# Note that the ConsoleHandler also has a separate level -# setting to limit messages printed to the console. -.level= INFO +# Root logger level +logger.level=INFO +# Root logger handlers +logger.handlers=FILE,CONSOLE -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ +# Console handler configuration +handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler +handler.CONSOLE.properties=autoFlush +handler.CONSOLE.level=INFO +handler.CONSOLE.autoFlush=true +handler.CONSOLE.formatter=PATTERN + +# File handler configuration +handler.FILE=org.jboss.logmanager.handlers.FileHandler +handler.FILE.level=INFO +handler.FILE.properties=autoFlush,fileName +handler.FILE.autoFlush=true +handler.FILE.fileName=boot.log +handler.FILE.formatter=PATTERN + +# Formatter pattern configuration +formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter +formatter.PATTERN.properties=pattern +formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n Modified: branches/i18n_logging/distribution/jboss-mc/pom.xml =================================================================== --- branches/i18n_logging/distribution/jboss-mc/pom.xml 2012-03-12 22:06:40 UTC (rev 12291) +++ branches/i18n_logging/distribution/jboss-mc/pom.xml 2012-03-13 07:59:26 UTC (rev 12292) @@ -14,10 +14,10 @@ <name>JBoss Microcontainer jar</name> <dependencies> - <dependency> + <!--<dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-spi</artifactId> - </dependency> + </dependency>--> <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> @@ -46,6 +46,14 @@ <groupId>sun-jaxb</groupId> <artifactId>jaxb-api</artifactId> </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.logmanager</groupId> + <artifactId>jboss-logmanager</artifactId> + </dependency> </dependencies> <build> @@ -66,10 +74,16 @@ <goal>shade</goal> </goals> <configuration> + <artifactSet> + <excludes> + <exclude>org.jboss.netty:netty</exclude> + <exclude>org.jboss.logging:jboss-logging-spi</exclude> + </excludes> + </artifactSet> <filters> - <filter> + <!--<filter> <artifact>org.jboss.logging:jboss-logging-spi</artifact> - </filter> + </filter>--> <filter> <artifact>org.jboss.microcontainer:jboss-kernel</artifact> </filter> @@ -91,6 +105,12 @@ <filter> <artifact>sun-jaxb:jaxb-api</artifact> </filter> + <filter> + <artifact>org.jboss.logging:jboss-logging</artifact> + </filter> + <filter> + <artifact>org.jboss.logmanager:jboss-logmanager</artifact> + </filter> </filters> </configuration> </execution> Modified: branches/i18n_logging/distribution/jnp-client/pom.xml =================================================================== --- branches/i18n_logging/distribution/jnp-client/pom.xml 2012-03-12 22:06:40 UTC (rev 12291) +++ branches/i18n_logging/distribution/jnp-client/pom.xml 2012-03-13 07:59:26 UTC (rev 12292) @@ -19,9 +19,9 @@ <artifactId>jnpserver</artifactId> </dependency> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + </dependency> </dependencies> <build> @@ -45,6 +45,7 @@ <artifactSet> <excludes> <exclude>org.jboss.netty:netty</exclude> + <exclude>org.jboss.logging:jboss-logging-spi</exclude> </excludes> </artifactSet> <filters> @@ -57,7 +58,7 @@ </includes> </filter> <filter> - <artifact>org.jboss.logging:jboss-logging-spi</artifact> + <artifact>org.jboss.logging:jboss-logging</artifact> <includes> <include>org/jboss/logging/**/*.class</include> </includes> Modified: branches/i18n_logging/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQException.java =================================================================== --- branches/i18n_logging/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQException.java 2012-03-12 22:06:40 UTC (rev 12291) +++ branches/i18n_logging/hornetq-commons/src/main/java/org/hornetq/api/core/HornetQException.java 2012-03-13 07:59:26 UTC (rev 12292) @@ -206,6 +206,11 @@ this.code = code; } + public HornetQException(final String msg) + { + super(msg); + } + public HornetQException(final int code, final String msg) { super(msg); @@ -225,6 +230,11 @@ return code; } + public void setCode(int code) + { + this.code = code; + } + @Override public String toString() { Modified: branches/i18n_logging/hornetq-core/pom.xml =================================================================== --- branches/i18n_logging/hornetq-core/pom.xml 2012-03-12 22:06:40 UTC (rev 12291) +++ branches/i18n_logging/hornetq-core/pom.xml 2012-03-13 07:59:26 UTC (rev 12292) @@ -14,6 +14,18 @@ <dependencies> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-processor</artifactId> + </dependency> + + <!-- + JBoss Logging + --> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + </dependency> + <dependency> <groupId>org.hornetq</groupId> <artifactId>hornetq-commons</artifactId> <version>${project.version}</version> Added: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQLogger.java =================================================================== --- branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQLogger.java (rev 0) +++ branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQLogger.java 2012-03-13 07:59:26 UTC (rev 12292) @@ -0,0 +1,202 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat, Inc., and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.hornetq.core.server.impl; + +/** + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * 3/8/12 + */ +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.server.HornetQServer; +import org.jboss.logging.BasicLogger; +import org.jboss.logging.Cause; +import org.jboss.logging.LogMessage; +import org.jboss.logging.Logger; +import org.jboss.logging.Message; +import org.jboss.logging.MessageLogger; + +import java.util.concurrent.ExecutorService; + +@MessageLogger(projectCode = "HQ") +public interface HornetQLogger extends BasicLogger +{ + /** + * The default logger. + */ + HornetQLogger LOGGER = Logger.getMessageLogger(HornetQLogger.class, HornetQLogger.class.getPackage().getName()); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1001, value = "{0} server is starting with configuration {1}", format = Message.Format.MESSAGE_FORMAT) + void serverStarting(String type, Configuration configuration); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1002, value = "{0} is already started, ignoring the call to start..", format = Message.Format.MESSAGE_FORMAT) + void serverAlreadyStarted(String type); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1003, value = "HornetQ Server version {0} [{1}] {2}", format = Message.Format.MESSAGE_FORMAT) + void serverStarted(String fullVersion, SimpleString nodeId, String identity); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1004, value = "HornetQ Server version {0} [{1}] stopped", format = Message.Format.MESSAGE_FORMAT) + void serverStopped(String version, SimpleString nodeId); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1005, value = "trying to deploy queue {0}", format = Message.Format.MESSAGE_FORMAT) + void deployQueue(SimpleString queueName); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1006, value = "{0}", format = Message.Format.MESSAGE_FORMAT) + void dumpServerInfo(String serverInfo); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1007, value = "Deleting pending large message as it wasn't completed: {0}", format = Message.Format.MESSAGE_FORMAT) + void deletingPendingMessage(Pair<Long, Long> msgToDelete); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1008, value = "Waiting to obtain live lock", format = Message.Format.MESSAGE_FORMAT) + void awaitingLiveLock(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1009, value = "Server is now live", format = Message.Format.MESSAGE_FORMAT) + void serverIsLive(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1010, value = "live server wants to restart, restarting server in backup" , format = Message.Format.MESSAGE_FORMAT) + void awaitFailBack(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1011, value = "HornetQ Backup Server version {0} [{1}] started, waiting live to fail before it gets active", + format = Message.Format.MESSAGE_FORMAT) + void backupServerStarted(String version, SimpleString nodeID); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1012, value = "Backup Server is now live", format = Message.Format.MESSAGE_FORMAT) + void backupServerIsLive(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1013, value = "Server {0} is now live", format = Message.Format.MESSAGE_FORMAT) + void serverIsLive(String identity); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2001, value = "HornetQServer is being finalized and has not been stopped. Please remember to stop the server before letting it go out of scope" , + format = Message.Format.MESSAGE_FORMAT) + void serverFinalisedWIthoutBeingSTopped(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2002, value = "Error closing sessions while stopping server" , format = Message.Format.MESSAGE_FORMAT) + void errorClosingSessionsWhileStoppingServer(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2003, value = "Timed out waiting for pool to terminate {0}. Interrupting all its threads!", format = Message.Format.MESSAGE_FORMAT) + void timedOutStoppingThreadpool(ExecutorService service); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2004, value = "Must specify a name for each divert. This one will not be deployed." , format = Message.Format.MESSAGE_FORMAT) + void divertWithNoName(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2005, value = "Must specify an address for each divert. This one will not be deployed." , format = Message.Format.MESSAGE_FORMAT) + void divertWithNoAddress(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2006, value = "Must specify a forwarding address for each divert. This one will not be deployed." , format = Message.Format.MESSAGE_FORMAT) + void divertWithNoForwardingAddress(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2007, value = "Binding already exists with name {0}, divert will not be deployed", format = Message.Format.MESSAGE_FORMAT) + void divertBindingNotExists(SimpleString bindingName); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2008, value = "Security risk! HornetQ is running with the default cluster admin user and default password. " + + "Please see the HornetQ user guide, cluster chapter, for instructions on how to change this." , format = Message.Format.MESSAGE_FORMAT) + void clusterSecurityRisk(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2009, value = "unable to restart server, please kill and restart manually", format = Message.Format.MESSAGE_FORMAT) + void serverRestartWarning(); + + @LogMessage(level = Logger.Level.WARN) + void serverRestartWarning(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2010, value = "Unable to announce backup for replication. Trying to stop the server.", format = Message.Format.MESSAGE_FORMAT) + void replicationStartProblem(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2011, value = "Critical IO Error, shutting down the server. code={0}, message={1}", format = Message.Format.MESSAGE_FORMAT) + void ioErrorShutdownServer(int code, String message); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2012, value = "Error stopping server", format = Message.Format.MESSAGE_FORMAT) + void errorStoppingServer(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2013, value = "Timed out waiting for backup activation to exit", format = Message.Format.MESSAGE_FORMAT) + void backupActivationProblem(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2014, value = "Error when trying to start replication", format = Message.Format.MESSAGE_FORMAT) + void errorStartingReplication(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2015, value = "Error when trying to stop replication", format = Message.Format.MESSAGE_FORMAT) + void errorStoppingReplication(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2016, value = "{0}", format = Message.Format.MESSAGE_FORMAT) + void warn(String message); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3001, value = "Server already started!", format = Message.Format.MESSAGE_FORMAT) + void serverAlreadyStarted(); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3002, value = "Starting server {0}", format = Message.Format.MESSAGE_FORMAT) + void startingServer(HornetQServer server); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3003, value = "Cancelled the execution of {0}", format = Message.Format.MESSAGE_FORMAT) + void cancelExecution(Runnable runnable); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3004, value = "First part initialization on {0}", format = Message.Format.MESSAGE_FORMAT) + void initializeFirstPart(Runnable runnable); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3005, value = "announcing backup to the former live {0}", format = Message.Format.MESSAGE_FORMAT) + void announceBackupToFormerLive(Runnable runnable); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3006, value = "{0} ::Stopping live node in favor of failback", format = Message.Format.MESSAGE_FORMAT) + void stoppingLiveNodeInFavourOfFailback(HornetQServerImpl server); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3007, value = "{0} ::Starting backup node now after failback", format = Message.Format.MESSAGE_FORMAT) + void startingBackupAfterFailure(HornetQServerImpl server); + + @LogMessage(level = Logger.Level.ERROR) + @Message(id = 4001, value = "Failure in initialisation", format = Message.Format.MESSAGE_FORMAT) + void initializationError(@Cause Throwable e); +} Added: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQMessageBundle.java =================================================================== --- branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQMessageBundle.java (rev 0) +++ branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQMessageBundle.java 2012-03-13 07:59:26 UTC (rev 12292) @@ -0,0 +1,55 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat, Inc., and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.hornetq.core.server.impl; + +import org.hornetq.api.core.HornetQException; +import org.jboss.logging.Field; +import org.jboss.logging.Message; +import org.jboss.logging.MessageBundle; +import org.jboss.logging.Messages; +import org.jboss.logging.Param; +import org.jboss.logging.Property; + +/** + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * 3/12/12 + */ +@MessageBundle(projectCode = "HQ") +public interface HornetQMessageBundle +{ + HornetQMessageBundle MESSAGES = Messages.getBundle(HornetQMessageBundle.class); + + @Message(id = 9001, value = "Generating thread dump because - {0}", format = Message.Format.MESSAGE_FORMAT) + String generatingThreadDump(String reason); + + @Message(id = 9002, value = "End Thread dump", format = Message.Format.MESSAGE_FORMAT) + String endThreadDump(); + + @Message(id = 9003, value = "Thread {0} name {1} id {2} group {3}", format = Message.Format.MESSAGE_FORMAT) + String threadInfo(Thread key, String name, Long id, ThreadGroup group); + + @Message(id = 9004, value = "Connected server is not a backup server", format = Message.Format.MESSAGE_FORMAT) + HornetQException notABackupServer(@Property Integer code); + + @Message(id = 9005, value = "Backup replication server is already connected to another server", format = Message.Format.MESSAGE_FORMAT) + String backupServerAlreadyConnectingToLive(); +} Modified: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2012-03-12 22:06:40 UTC (rev 12291) +++ branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2012-03-13 07:59:26 UTC (rev 12292) @@ -150,7 +150,6 @@ // Constants // ------------------------------------------------------------------------------------ - private static final Logger log = Logger.getLogger(HornetQServerImpl.class); /* * JMS Topics (which are outside of the scope of the core API) will require a dumb subscription @@ -343,11 +342,11 @@ { if (started) { - log.debug("Server already started!"); + HornetQLogger.LOGGER.serverAlreadyStarted(); return; } - log.debug("Starting server " + this); + HornetQLogger.LOGGER.startingServer(this); OperationContextImpl.clearContext(); try @@ -364,12 +363,11 @@ if (started) { - HornetQServerImpl.log.info((configuration.isBackup() ? "backup" : "live") + " is already started, ignoring the call to start.."); + HornetQLogger.LOGGER.serverAlreadyStarted(configuration.isBackup() ? "backup" : "live"); return; } - HornetQServerImpl.log.info((configuration.isBackup() ? "backup" : "live") + " server is starting with configuration " + - configuration); + HornetQLogger.LOGGER.serverStarting((configuration.isBackup() ? "backup" : "live"), configuration); if (configuration.isRunSyncSpeedTest()) { @@ -411,12 +409,7 @@ started = true; - HornetQServerImpl.log.info("HornetQ Server version " + getVersion().getFullVersion() + - " [" + - nodeManager.getNodeId() + - "]" + - (this.identity != null ? " (" + identity : ")") + - " started"); + HornetQLogger.LOGGER.serverStarted(getVersion().getFullVersion(), nodeManager.getNodeId(), identity != null ? identity : ""); } // start connector service @@ -435,7 +428,7 @@ { if (started) { - HornetQServerImpl.log.warn("HornetQServer is being finalized and has not been stopped. Please remember to stop the " + "server before letting it go out of scope"); + HornetQLogger.LOGGER.serverFinalisedWIthoutBeingSTopped(); stop(); } @@ -456,19 +449,13 @@ Map<Thread, StackTraceElement[]> stackTrace = Thread.getAllStackTraces(); - out.println("Generating thread dump because - " + reason); + out.println(HornetQMessageBundle.MESSAGES.generatingThreadDump(reason)); out.println("*******************************************************************************"); for (Map.Entry<Thread, StackTraceElement[]> el : stackTrace.entrySet()) { out.println("==============================================================================="); - out.println("Thread " + el.getKey() + - " name = " + - el.getKey().getName() + - " id = " + - el.getKey().getId() + - " group = " + - el.getKey().getThreadGroup()); + out.println(HornetQMessageBundle.MESSAGES.threadInfo(el.getKey(), el.getKey().getName(), el.getKey().getId(), el.getKey().getThreadGroup())); out.println(); for (StackTraceElement traceEl : el.getValue()) { @@ -477,10 +464,10 @@ } out.println("==============================================================================="); - out.println("End Thread dump"); + out.println(HornetQMessageBundle.MESSAGES.endThreadDump()); out.println("*******************************************************************************"); - log.warn(str.toString()); + HornetQLogger.LOGGER.warn(str.toString()); } public void stop(boolean failoverOnServerShutdown) throws Exception @@ -540,7 +527,7 @@ { // If anything went wrong with closing sessions.. we should ignore it // such as transactions.. etc. - log.warn(e.getMessage(), e); + HornetQLogger.LOGGER.errorClosingSessionsWhileStoppingServer(e); } } @@ -631,11 +618,10 @@ { if (!threadPool.awaitTermination(10, TimeUnit.SECONDS)) { - HornetQServerImpl.log.warn("Timed out waiting for pool to terminate " + threadPool + - ". Interrupting all its threads!"); + HornetQLogger.LOGGER.timedOutStoppingThreadpool(threadPool); for (Runnable r : threadPool.shutdownNow()) { - log.debug("Cancelled the execution of " + r); + HornetQLogger.LOGGER.cancelExecution(r); } } } @@ -697,10 +683,7 @@ addressSettingsRepository.clearCache(); - HornetQServerImpl.log.info("HornetQ Server version " + getVersion().getFullVersion() + - " [" + - tempNodeID + - "] stopped"); + HornetQLogger.LOGGER.serverStopped(getVersion().getFullVersion(), tempNodeID); Logger.reset(); } @@ -859,7 +842,7 @@ { if (!configuration.isBackup()) { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "Connected server is not a backup server"); + throw HornetQMessageBundle.MESSAGES.notABackupServer(HornetQException.ILLEGAL_STATE); } channel.setHandler(replicationEndpoint); @@ -867,7 +850,7 @@ if (replicationEndpoint.getChannel() != null) { throw new HornetQException(HornetQException.ILLEGAL_STATE, - "Backup replication server is already connected to another server"); + HornetQMessageBundle.MESSAGES.backupServerAlreadyConnectingToLive()); } replicationEndpoint.setChannel(channel); @@ -996,7 +979,7 @@ final boolean durable, final boolean temporary) throws Exception { - log.info("trying to deploy queue " + queueName); + HornetQLogger.LOGGER.deployQueue(queueName); return createQueue(address, queueName, filterString, durable, temporary, true); } @@ -1103,21 +1086,21 @@ { if (config.getName() == null) { - HornetQServerImpl.log.warn("Must specify a name for each divert. This one will not be deployed."); + HornetQLogger.LOGGER.divertWithNoName(); return; } if (config.getAddress() == null) { - HornetQServerImpl.log.warn("Must specify an address for each divert. This one will not be deployed."); + HornetQLogger.LOGGER.divertWithNoAddress(); return; } if (config.getForwardingAddress() == null) { - HornetQServerImpl.log.warn("Must specify an forwarding address for each divert. This one will not be deployed."); + HornetQLogger.LOGGER.divertWithNoForwardingAddress(); return; } @@ -1126,7 +1109,7 @@ if (postOffice.getBinding(sName) != null) { - HornetQServerImpl.log.warn("Binding already exists with name " + sName + ", divert will not be deployed"); + HornetQLogger.LOGGER.divertBindingNotExists(sName); return; } @@ -1330,8 +1313,7 @@ if (ConfigurationImpl.DEFAULT_CLUSTER_USER.equals(configuration.getClusterUser()) && ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD.equals(configuration.getClusterPassword())) { - log.warn("Security risk! HornetQ is running with the default cluster admin user and default password. " - + "Please see the HornetQ user guide, cluster chapter, for instructions on how to change this."); + HornetQLogger.LOGGER.clusterSecurityRisk(); } securityStore = new SecurityStoreImpl(securityRepository, @@ -1463,7 +1445,7 @@ { public void run() { - HornetQServerImpl.log.info(dumper.dump()); + HornetQLogger.LOGGER.dumpServerInfo(dumper.dump()); } }, 0, dumpInfoInterval, TimeUnit.MILLISECONDS); } @@ -1628,7 +1610,7 @@ for (Pair<Long, Long> msgToDelete : pendingLargeMessages) { - log.info("Deleting pending large message as it wasn't completed:" + msgToDelete); + HornetQLogger.LOGGER.deletingPendingMessage(msgToDelete); LargeServerMessage msg = storageManager.createLargeMessage(); msg.setMessageID(msgToDelete.getB()); msg.setPendingRecordID(msgToDelete.getA()); @@ -1851,7 +1833,7 @@ { if (!restarting && nodeManager.isAwaitingFailback()) { - log.info("live server wants to restart, restarting server in backup"); + HornetQLogger.LOGGER.awaitFailBack(); restarting = true; Thread t = new Thread(new Runnable() { @@ -1859,18 +1841,18 @@ { try { - log.debug(HornetQServerImpl.this + "::Stopping live node in favor of failback"); + HornetQLogger.LOGGER.stoppingLiveNodeInFavourOfFailback(HornetQServerImpl.this); stop(true); // We need to wait some time before we start the backup again // otherwise we may eventually start before the live had a chance to get it Thread.sleep(configuration.getFailbackDelay()); configuration.setBackup(true); - log.debug(HornetQServerImpl.this + "::Starting backup node now after failback"); + HornetQLogger.LOGGER.startingBackupAfterFailure(HornetQServerImpl.this); start(); } catch (Exception e) { - log.warn("unable to restart server, please kill and restart manually", e); + HornetQLogger.LOGGER.serverRestartWarning(); } } }); @@ -1879,7 +1861,7 @@ } catch (Exception e) { - log.warn(e.getMessage(), e); + HornetQLogger.LOGGER.serverRestartWarning(e); } } } @@ -1890,13 +1872,13 @@ { try { - log.info("Waiting to obtain live lock"); + HornetQLogger.LOGGER.awaitingLiveLock(); checkJournalDirectory(); - if (log.isDebugEnabled()) + if (HornetQLogger.LOGGER.isDebugEnabled()) { - log.debug("First part initialization on " + this); + HornetQLogger.LOGGER.initializeFirstPart(this); } initialisePart1(); @@ -1906,9 +1888,9 @@ // looks like we've failed over at some point need to inform that we are the backup so when the current // live // goes down they failover to us - if (log.isDebugEnabled()) + if (HornetQLogger.LOGGER.isDebugEnabled()) { - log.debug("announcing backup to the former live" + this); + HornetQLogger.LOGGER.announceBackupToFormerLive(this); } clusterManager.announceBackup(); @@ -1924,11 +1906,11 @@ initialisePart2(); - log.info("Server is now live"); + HornetQLogger.LOGGER.serverIsLive(); } catch (Exception e) { - log.error("Failure in initialisation", e); + HornetQLogger.LOGGER.initializationError(e); } } @@ -1959,10 +1941,7 @@ started = true; - log.info("HornetQ Backup Server version " + getVersion().getFullVersion() + - " [" + - nodeManager.getNodeId() + - "] started, waiting live to fail before it gets active"); + HornetQLogger.LOGGER.backupServerStarted(version.getFullVersion(), nodeManager.getNodeId()); nodeManager.awaitLiveNode(); @@ -1977,7 +1956,7 @@ clusterManager.activate(); - log.info("Backup Server is now live"); + HornetQLogger.LOGGER.backupServerIsLive(); nodeManager.releaseBackup(); if (configuration.isAllowAutoFailBack()) @@ -1997,12 +1976,12 @@ { if (!(e.getCause() instanceof InterruptedException)) { - log.error("Failure in initialisation", e); + HornetQLogger.LOGGER.initializationError(e); } } catch (Throwable e) { - log.error("Failure in initialisation", e); + HornetQLogger.LOGGER.initializationError(e); } } @@ -2058,7 +2037,7 @@ { failedAlready = true; - log.warn("Critical IO Error, shutting down the server. code=" + code + ", message=" + message); + HornetQLogger.LOGGER.ioErrorShutdownServer(code, message); new Thread() { @@ -2071,7 +2050,7 @@ } catch (Exception e) { - log.warn(e.getMessage(), e); + HornetQLogger.LOGGER.errorStoppingServer(e); } } }.start(); @@ -2135,7 +2114,7 @@ } catch (Exception e) { - log.warn("Unable to announce backup for replication. Trying to stop the server.", e); + HornetQLogger.LOGGER.replicationStartProblem(e); failedConnection = true; try { @@ -2154,8 +2133,7 @@ } }); - log.info("HornetQ Backup Server version " + getVersion().getFullVersion() + " [" + nodeManager.getNodeId() + - "] started, waiting live to fail before it gets active"); + HornetQLogger.LOGGER.backupServerStarted(version.getFullVersion(), nodeManager.getNodeId()); started = true; // Server node (i.e. Live node) is not running, now the backup takes over. @@ -2204,7 +2182,7 @@ if ((e instanceof InterruptedException || e instanceof IllegalStateException) && !started) // do not log these errors if the server is being stopped. return; - log.error("Failure in initialisation", e); + HornetQLogger.LOGGER.initializationError(e); e.printStackTrace(); } } @@ -2235,7 +2213,7 @@ if (System.currentTimeMillis() - start >= timeout) { - log.warn("Timed out waiting for backup activation to exit"); + HornetQLogger.LOGGER.backupActivationProblem(); } nodeManager.stopBackup(); @@ -2264,16 +2242,16 @@ if (identity != null) { - log.info("Server " + identity + " is now live"); + HornetQLogger.LOGGER.serverIsLive(identity); } else { - log.info("Server is now live"); + HornetQLogger.LOGGER.serverIsLive(); } } catch (Exception e) { - log.error("Failure in initialisation", e); + HornetQLogger.LOGGER.initializationError(e); } } @@ -2343,7 +2321,7 @@ * with) the backup, or (2) by an IO Error at the storage. If (1), we can swallow the * exception and ignore the replication request. If (2) the live will crash shortly. */ - log.warn("Exception when trying to start replication", e); + HornetQLogger.LOGGER.errorStartingReplication(e); try { @@ -2352,7 +2330,7 @@ } catch (Exception hqe) { - log.warn("Exception while trying to close replicationManager", hqe); + HornetQLogger.LOGGER.errorStoppingReplication(hqe); } finally { Added: branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/impl/HornetQLogger.i18n_fr.properties =================================================================== --- branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/impl/HornetQLogger.i18n_fr.properties (rev 0) +++ branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/impl/HornetQLogger.i18n_fr.properties 2012-03-13 07:59:26 UTC (rev 12292) @@ -0,0 +1,37 @@ +serverStarting={0} server is starting with configuration {1} +serverAlreadyStarted.1={0} is already started, ignoring the call to start.. +serverStarted=HornetQ Server version {0} [{1}] {2} +serverStopped=HornetQ Server version {0} [{1}] stopped +deployQueue=trying to deploy queue {0} +dumpServerInfo={0} +deletingPendingMessage=Deleting pending large message as it wasn't completed: {0} +awaitingLiveLock=Waiting to obtain live lock +serverIsLive.0=Server is now live +awaitFailBack=live server wants to restart, restarting server in backup +backupServerStarted=HornetQ Backup Server version {0} [{1}] started, waiting live to fail before it gets active +backupServerIsLive=Backup Server is now live +serverIsLive.1=Server {0} is now live +serverFinalisedWIthoutBeingSTopped=HornetQServer is being finalized and has not been stopped. Please remember to stop the server before letting it go out of scope +errorClosingSessionsWhileStoppingServer=Error closing sessions while stopping server +timedOutStoppingThreadpool=Timed out waiting for pool to terminate {0}. Interrupting all its threads! +divertWithNoName=Must specify a name for each divert. This one will not be deployed. +divertWithNoAddress=Must specify an address for each divert. This one will not be deployed. +divertWithNoForwardingAddress=Must specify a forwarding address for each divert. This one will not be deployed. +divertBindingNotExists=Binding already exists with name {0}, divert will not be deployed +clusterSecurityRisk=Security risk! HornetQ is running with the default cluster admin user and default password. Please see the HornetQ user guide, cluster chapter, for instructions on how to change this. +serverRestartWarning=unable to restart server, please kill and restart manually +replicationStartProblem=Unable to announce backup for replication. Trying to stop the server. +ioErrorShutdownServer=Critical IO Error, shutting down the server. code={0}, message={1} +errorStoppingServer=Error stopping server +backupActivationProblem=Timed out waiting for backup activation to exit +errorStartingReplication=Error when trying to start replication +errorStoppingReplication=Error when trying to stop replication +warn={0} +serverAlreadyStarted.0=Server already started! +startingServer=Starting server {0} +cancelExecution=Cancelled the execution of {0} +initializeFirstPart=First part initialization on {0} +announceBackupToFormerLive=announcing backup to the former live {0} +stoppingLiveNodeInFavourOfFailback={0} ::Stopping live node in favor of failback +startingBackupAfterFailure={0} ::Starting backup node now after failback +initializationError=Failure in initialisation Added: branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/impl/HornetQMessageBundle.i18n_fr.properties =================================================================== --- branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/impl/HornetQMessageBundle.i18n_fr.properties (rev 0) +++ branches/i18n_logging/hornetq-core/src/main/resources/org/hornetq/core/server/impl/HornetQMessageBundle.i18n_fr.properties 2012-03-13 07:59:26 UTC (rev 12292) @@ -0,0 +1,5 @@ +generatingThreadDump=Generating thread dump because - {0} +endThreadDump=End Thread dump +threadInfo=Thread {0} name {1} id {2} group {3} +notABackupServer=Connected server is not a backup server +backupServerAlreadyConnectingToLive=Backup replication server is already connected to another server Modified: branches/i18n_logging/pom.xml =================================================================== --- branches/i18n_logging/pom.xml 2012-03-12 22:06:40 UTC (rev 12291) +++ branches/i18n_logging/pom.xml 2012-03-13 07:59:26 UTC (rev 12292) @@ -143,6 +143,31 @@ <dependencyManagement> <dependencies> + <!-- + JBoss Tools + --> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-processor</artifactId> + <version>1.0.0.Final</version> + <scope>provided</scope> + </dependency> + + <!-- + JBoss Logging + --> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.1.0.GA</version> + </dependency> + + <dependency> + <groupId>org.jboss.logmanager</groupId> + <artifactId>jboss-logmanager</artifactId> + <version>1.2.2.GA</version> + </dependency> + <dependency> <groupId>net.java.dev.javacc</groupId> <artifactId>javacc</artifactId>