diff --git a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java index e1de77a4..9359d337 100644 --- a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java +++ b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java @@ -150,8 +150,8 @@ public class NettyAcceptor implements ServerAcceptor { LOG.error("An interruptedException was caught while initializing server. Protocol={}", protocol, ex); } catch (Exception e) { e.printStackTrace(); - LOG.error("端口 {} 已经被占用。请检查该端口被那个程序占用,找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", port, port); - System.out.println("端口 " + port + " 已经被占用。请检查该端口被那个程序占用,找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + port); + LOG.error("端口 {} 已经被占用或者无权限使用。如果无权限使用,请以root权限运行;如果被占用,请检查该端口被那个程序占用,找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", port, port); + System.out.println("端口 " + port + " 已经被占用或者无权限使用。如果无权限使用,请以root权限运行;如果被占用,请检查该端口被那个程序占用,找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + port); System.exit(-1); } } diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml index d1ed9f87..b7a9cbb7 100755 --- a/distribution/src/main/assembly/assembly.xml +++ b/distribution/src/main/assembly/assembly.xml @@ -74,12 +74,6 @@ moquette-broker-${project.version}.jar - - ../common/target/common-${project.version}.jar - java_client/ - common-${project.version}.jar - - ../sdk/target/sdk-${project.version}.jar server_sdk/ diff --git a/distribution/src/main/scripts/wildfirechat.bat b/distribution/src/main/scripts/wildfirechat.bat index 1aadc903..e0dafc9c 100644 --- a/distribution/src/main/scripts/wildfirechat.bat +++ b/distribution/src/main/scripts/wildfirechat.bat @@ -72,4 +72,8 @@ rem set JAVA_OPTS=%JAVA_OPTS% -XX:+UseGCLogFileRotation rem set JAVA_OPTS=%JAVA_OPTS% -XX:NumberOfGCLogFiles=10 rem set JAVA_OPTS=%JAVA_OPTS% -XX:GCLogFileSize=10M" +echo 请设置JVM参数Xmx和Xms!!! +rem set JAVA_OPTS=%JAVA_OPTS% -Xmx2G +rem set JAVA_OPTS=%JAVA_OPTS% -Xms2G + %JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dcom.mchange.v2.c3p0.cfg.xml=%C3P0_CONF_FILE% -Dhazelcast.configuration=file:%HZ_CONF_FILE% -Dwildfirechat.path=%WILDFIRECHAT_PATH% -cp %WILDFIRECHAT_HOME%\lib\* cn.wildfirechat.server.Server diff --git a/distribution/src/main/scripts/wildfirechat.sh b/distribution/src/main/scripts/wildfirechat.sh index 1cfb33aa..0c97ce77 100755 --- a/distribution/src/main/scripts/wildfirechat.sh +++ b/distribution/src/main/scripts/wildfirechat.sh @@ -83,8 +83,9 @@ JAVA_OPTS="$JAVA_OPTS -XX:+UseGCLogFileRotation" JAVA_OPTS="$JAVA_OPTS -XX:NumberOfGCLogFiles=10" JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M" -#JAVA_OPTS="$JAVA_OPTS -Xmx128M" -#JAVA_OPTS="$JAVA_OPTS -Xms128M" +echo "请设置JVM参数Xmx和Xms!!!" +#JAVA_OPTS="$JAVA_OPTS -Xmx2G" +#JAVA_OPTS="$JAVA_OPTS -Xms2G" $JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dcom.mchange.v2.c3p0.cfg.xml="$C3P0_CONF_FILE" -Dhazelcast.configuration="file:$HZ_CONF_FILE" -Dwildfirechat.path="$WILDFIRECHAT_PATH" -cp "$WILDFIRECHAT_HOME/lib/*" cn.wildfirechat.server.Server