anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed error in path recognizing for config dir in distribution

Browse Source
This commit is contained in:
selva.andre
2014-03-05 23:37:54 +01:00
parent 1897154cfd
commit 01bbbd3bda
5 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
+3 -2
View File
@@ -187,8 +187,9 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
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);
}
broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
+3 -2
View File
@@ -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();
broker/src/main/resources/log4j.properties
-7
View File
@@ -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
distribution/src/main/resources/log4j.properties
+2 -11
View File
@@ -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
distribution/src/main/scripts/moquette.sh
+2 -2
View File
@@ -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