升级到0.6.1

Author: 夜色

bin/env-mp.sh

@@ -36,6 +36,16 @@ then
   fi
 fi
 
+if [ "x${MP_DATA_DIR}" = "x" ]
+then
+    MP_DATA_DIR="${MPUSH_PREFIX}/tmp"
+fi
+
+if [ "x${MP_LOG_DIR}" = "x" ]
+then
+    MP_LOG_DIR="${MPUSH_PREFIX}/logs"
+fi
+
 if [ -f "${MP_BIN_DIR}/set-env.sh" ]; then
   . "${MP_BIN_DIR}/set-env.sh"
 fi
@@ -52,16 +62,6 @@ then
     . "$MP_BIN_DIR/java.env"
 fi
 
-if [ "x${MP_DATA_DIR}" = "x" ]
-then
-    MP_DATA_DIR="${MPUSH_PREFIX}/tmp"
-fi
-
-if [ "x${MP_LOG_DIR}" = "x" ]
-then
-    MP_LOG_DIR="${MPUSH_PREFIX}/logs"
-fi
-
 if [ "x${MP_LOG4J_PROP}" = "x" ]
 then
     MP_LOG4J_PROP="INFO,CONSOLE"
@@ -77,39 +77,17 @@ fi
 #add the conf dir to classpath
 CLASSPATH="$MP_CFG_DIR:$CLASSPATH"
 
-for i in "$MP_BIN_DIR"/../src/java/lib/*.jar
-do
-    CLASSPATH="$i:$CLASSPATH"
-done
-
 #make it work in the binary package
 #(use array for LIB_PATH to account for spaces within wildcard expansion)
-if [ -e "${MPUSH_PREFIX}"/share/mpush/mpush-*.jar ]; then
-  LIB_PATH=("${MPUSH_PREFIX}"/share/mpush/*.jar)
-else
-  #release tarball format
-  for i in "$MP_BIN_DIR"/../mpush-*.jar
-  do
-    CLASSPATH="$i:$CLASSPATH"
-  done
-  LIB_PATH=("${MP_BIN_DIR}"/../lib/*.jar)
+if [ -e "${MPUSH_PREFIX}"/../lib/plugins/*.jar ]; then
+  LIB_PATH=("${MPUSH_PREFIX}"/../lib/plugins/*.jar)
 fi
 
 for i in "${LIB_PATH[@]}"
 do
     CLASSPATH="$i:$CLASSPATH"
 done
 
-#make it work for developers
-for d in "$MP_BIN_DIR"/../build/lib/*.jar
-do
-   CLASSPATH="$d:$CLASSPATH"
-done
-
-#make it work for developers
-CLASSPATH="$MP_BIN_DIR/../build/classes:$CLASSPATH"
-
-
 case "`uname`" in
     CYGWIN*) cygwin=true ;;
     *) cygwin=false ;;
@@ -119,5 +97,3 @@ if $cygwin
 then
     CLASSPATH=`cygpath -wp "$CLASSPATH"`
 fi
-
-#echo "CLASSPATH=$CLASSPATH"

bin/set-env.sh

@@ -1,2 +1,11 @@
 #!/usr/bin/env bash
-#JVM_FLAGS="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8008 -Dio.netty.leakDetectionLevel=advanced"
+#开启远程调试
+#JVM_FLAGS="$JVM_FLAGS -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8008"
+
+#GC配置
+#运行模式 整个堆内存大小 GC算法
+#JVM_FLAGS="$JVM_FLAGS -server -Xmx1024m -Xms1024m -XX:+UseG1GC -XX:MaxGCPauseMillis=200"
+#GC日志 发生OOM时创建堆内存转储文件
+#JVM_FLAGS="$JVM_FLAGS -Xloggc:$MP_LOG_DIR/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
+#发生OOM后的操作
+#JVM_FLAGS="-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$MP_LOG_DIR -XX:OnOutOfMemoryError=$MP_BIN_DIR/restart.sh"