Merge pull request #457 from shanmengm/master

Merge dev-0.3
edp963 · Sep 21, 2018 · f1302a3 · f1302a3
2 parents a0b3e62 + 221f9a9
commit f1302a3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml
@@ -57,6 +57,12 @@
             </directory>
             <outputDirectory>userfiles</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}/logs
+            </directory>
+            <outputDirectory>logs</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>
                 ${project.parent.basedir}/davinci-ui

diff --git a/assembly/src/main/assembly/release.xml b/assembly/src/main/assembly/release.xml
@@ -61,6 +61,12 @@
             </directory>
             <outputDirectory>userfiles</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}/logs
+            </directory>
+            <outputDirectory>logs</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>
                 ${project.parent.basedir}/davinci-ui

diff --git a/bin/start-server.sh b/bin/start-server.sh
@@ -29,7 +29,7 @@ script_dir=$(cd `dirname $0`; pwd)
 cd $script_dir/../
 TODAY=`date "+%Y-%m-%d"`
 LOG_PATH=$DAVINCI3_HOME/logs/davinci.$TODAY.log
-nohup java -Dfile.encoding=UTF-8 -cp $JAVA_HOME/lib/*:$DAVINCI3_HOME/lib/*:davinci-server_3.01-0.3.0-SNAPSHOT.jar edp.DavinciServerApplication   >$LOG_PATH  2>&1 &
+nohup java -Dfile.encoding=UTF-8 -cp $JAVA_HOME/lib/*:$DAVINCI3_HOME/lib/*:davinci-server_3.01-0.3.0-SNAPSHOT.jar edp.DavinciServerApplication > $LOG_PATH  2>&1 &
 
 echo "=========================================="
 echo "Starting..., press \`CRTL + C\` to exit log"