Merge pull request #10 from ni-ze/main

Modify start shell
alibaba · Jun 21, 2022 · f57ceee · f57ceee
2 parents f084c90 + f2dca21
commit f57ceee
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/rsqldb-disk/bin/startAll.sh b/rsqldb-disk/bin/startAll.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+cd `dirname $0`
+
+chmod +x startRunner.sh
+chmod +x startServer.sh
+
+sh startRunner.sh
+
+sh startServer.sh
+
+tail -f /etc/hosts
+
+
+
diff --git a/rsqldb-disk/bin/startRunner.sh b/rsqldb-disk/bin/startRunner.sh
@@ -31,7 +31,7 @@ JVM_OPTS="${JVM_OPTS} -cp ${CLASSPATH}"
 # shellcheck disable=SC2068
 # shellcheck disable=SC2039
 
-$JAVA ${JVM_OPTS} org.alibaba.rsqldb.runner.StreamServer ${BASE_DIR}/conf/rsqldb.conf
-
+nohup $JAVA ${JVM_OPTS} org.alibaba.rsqldb.runner.StreamRunner ${BASE_DIR}/conf/rsqldb.conf > ${BASE_DIR}/log/runner.log &
 
+echo "start runner success."
 
diff --git a/rsqldb-disk/bin/startServer.sh b/rsqldb-disk/bin/startServer.sh
@@ -25,6 +25,6 @@ fi
 JVM_OPTS="${JVM_OPTS} -cp ${CLASSPATH}"
 
 
-$JAVA ${JVM_OPTS} -jar ${BASE_DIR}/lib/rsqldb-server-1.0.0-SNAPSHOT.jar
-
+nohup $JAVA ${JVM_OPTS} -jar ${BASE_DIR}/lib/rsqldb-server-1.0.0-SNAPSHOT.jar > ${BASE_DIR}/log/rsqldb-server.log 2>&1 &
 
+echo "start server success."
diff --git a/rsqldb-runner/pom.xml b/rsqldb-runner/pom.xml
@@ -43,7 +43,7 @@
                     </descriptorRefs>
                     <archive>
                         <manifest>
-                            <mainClass>org.alibaba.rsqldb.runner.StreamServer</mainClass>
+                            <mainClass>org.alibaba.rsqldb.runner.StreamRunner</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

diff --git a/...g/alibaba/rsqldb/runner/StreamServer.java → ...g/alibaba/rsqldb/runner/StreamRunner.java b/...g/alibaba/rsqldb/runner/StreamServer.java → ...g/alibaba/rsqldb/runner/StreamRunner.java
@@ -35,7 +35,7 @@
 import org.apache.rocketmq.streams.common.utils.PropertiesUtils;
 import org.apache.rocketmq.streams.configurable.ConfigurableComponent;
 
-public class StreamServer {
+public class StreamRunner {
     private static ScheduledExecutorService scheduledExecutorService = new ScheduledThreadPoolExecutor(5);
 
     public static void main(String[] args) throws Throwable {