From 01bbbd3bda3045837ef0f13f39dbcea61624f09a Mon Sep 17 00:00:00 2001 From: "selva.andre" Date: Wed, 5 Mar 2014 23:37:54 +0100 Subject: [PATCH] Fixed error in path recognizing for config dir in distribution --- .../messaging/spi/impl/SimpleMessaging.java | 5 +++-- .../java/org/dna/mqtt/moquette/server/Server.java | 5 +++-- broker/src/main/resources/log4j.properties | 7 ------- distribution/src/main/resources/log4j.properties | 13 ++----------- distribution/src/main/scripts/moquette.sh | 4 ++-- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java index 7c30bb03..d19ed993 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java +++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java @@ -187,8 +187,9 @@ public class SimpleMessaging implements IMessaging, EventHandler { subscriptions.init(m_storageService); - String path = props.getProperty("password_file"); - IAuthenticator authenticator = new FileAuthenticator(path); + String passwdPath = props.getProperty("password_file"); + String configPath = System.getProperty("moquette.path", ""); + IAuthenticator authenticator = new FileAuthenticator(configPath + passwdPath); m_processor.init(subscriptions, m_storageService, authenticator); } diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java index 8560666e..dab5357c 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java +++ b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java @@ -40,9 +40,10 @@ public class Server { public void startServer() throws IOException { ConfigurationParser confParser = new ConfigurationParser(); try { - confParser.parse(new File("config/moquette.conf")); + String configPath = System.getProperty("moquette.path", ""); + confParser.parse(new File(configPath + "config/moquette.conf")); } catch (ParseException pex) { - LOG.warn("An error occured in parsing configuration, fallback on deafult configuration", pex); + LOG.warn("An error occured in parsing configuration, fallback on default configuration", pex); } Properties configProps = confParser.getProperties(); diff --git a/broker/src/main/resources/log4j.properties b/broker/src/main/resources/log4j.properties index 970a1215..c018fbce 100644 --- a/broker/src/main/resources/log4j.properties +++ b/broker/src/main/resources/log4j.properties @@ -1,13 +1,6 @@ # Set root logger level to DEBUG and its only appender to A1. #log4j.rootLogger=ERROR, A1 log4j.rootLogger=ERROR, stdout, file -#log4j.rootLogger=WARN, A1 -#log4j.logger.org.dna.mqtt.moquette.client=WARN -#log4j.logger.org.mina=WARN -#log4j.logger.org.dna.mqtt.moquette.server=DEBUG -#log4j.logger.org.dna.mqtt.moquette.messaging=DEBUG -#log4j.logger.org.dna.mqtt.moquette.proto.MQTTLoggingFilter=DEBUG -#log4j.logger.org.dna.mqtt.moquette.proto.PublishDecoder=DEBUG log4j.logger.org.dna.mqtt=INFO log4j.logger.org.dna.mqtt.moquette.server.ServerIntegrationFuseTest=DEBUG diff --git a/distribution/src/main/resources/log4j.properties b/distribution/src/main/resources/log4j.properties index 29d53da5..f6223173 100644 --- a/distribution/src/main/resources/log4j.properties +++ b/distribution/src/main/resources/log4j.properties @@ -1,20 +1,11 @@ # Set root logger level to DEBUG and its only appender to A1. #log4j.rootLogger=ERROR, A1 log4j.rootLogger=ERROR, stdout, file -#log4j.rootLogger=WARN, A1 -#log4j.logger.org.dna.mqtt.moquette.client=WARN -#log4j.logger.org.mina=WARN -#log4j.logger.org.dna.mqtt.moquette.server=DEBUG -#log4j.logger.org.dna.mqtt.moquette.messaging=DEBUG -#log4j.logger.org.dna.mqtt.moquette.proto.MQTTLoggingFilter=DEBUG -#log4j.logger.org.dna.mqtt.moquette.proto.PublishDecoder=DEBUG log4j.logger.org.dna.mqtt=INFO -log4j.logger.org.dna.mqtt.moquette.server.ServerIntegrationFuseTest=DEBUG -#log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.ProtocolProcessor=INFO -#log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.ProtocolProcessor=DEBUG -log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.ProtocolProcessor=TRACE +log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.ProtocolProcessor=INFO log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging=WARN + #Protocol parsing log4j.logger.org.dna.mqtt.moquette.server.netty.NettyMQTTHandler=WARN #log4j.logger.org.dna.mqtt.moquette.server.netty.NettyMQTTHandler=DEBUG diff --git a/distribution/src/main/scripts/moquette.sh b/distribution/src/main/scripts/moquette.sh index 7247ee76..3190b735 100644 --- a/distribution/src/main/scripts/moquette.sh +++ b/distribution/src/main/scripts/moquette.sh @@ -47,10 +47,10 @@ fi export JAVA LOG_FILE=$MOQUETTE_HOME/config/moquette-log.properties +MOQUETTE_PATH=$MOQUETTE_HOME/ #LOG_CONSOLE_LEVEL=info #LOG_FILE_LEVEL=fine -#set MOQUETTE_SETTINGS="-Dprofiler.enabled=true -Dcache.level1.enabled=false -Dcache.level2.enabled=false" JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true" -$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -cp "$LOG_FILE:$MOQUETTE_HOME/lib/moquette-broker-0.5.jar:$MOQUETTE_HOME/lib/*" org.dna.mqtt.moquette.server.Server +$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dmoquette.path="$MOQUETTE_PATH" -cp "$MOQUETTE_HOME/lib/moquette-broker-0.5.jar:$MOQUETTE_HOME/lib/*" org.dna.mqtt.moquette.server.Server