[incubator-tubemq] 01/01: [TUBEMQ-167] Change to relative path in configs. (#105)

[gx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gxcheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git

commit 1ced522caeae9348ae5bb29159b467ca6e3dc588
Author: Ping Yu <sh...@gmail.com>
AuthorDate: Sat May 30 15:52:02 2020 +0800

    [TUBEMQ-167] Change to relative path in configs. (#105)
    
    Signed-off-by: Guangxu Cheng <gx...@apache.org>
---
 bin/master.sh                 | 4 ++++
 conf/broker.ini               | 2 +-
 conf/master.ini               | 4 ++--
 resources/velocity.properties | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/master.sh b/bin/master.sh
index 8b8693b..399fae1 100644
--- a/bin/master.sh
+++ b/bin/master.sh
@@ -75,12 +75,16 @@ function start_server() {
     config_files="-f $BASE_DIR/conf/master.ini"
     
 	echo "Starting Master server..."
+  pushd .
     
+    cd $BASE_DIR
    	echo "$JAVA $MASTER_ARGS  org.apache.tubemq.server.tools.MasterStartup $config_files"
     sleep 1
     nohup $JAVA $MASTER_ARGS  org.apache.tubemq.server.tools.MasterStartup $config_files 2>&1 >>$LOG_FILE &
     echo $! > $PID_FILE
     chmod 755 $PID_FILE
+  
+  popd
 }
 
 function stop_server() {
diff --git a/conf/broker.ini b/conf/broker.ini
index 9017597..fce559d 100644
--- a/conf/broker.ini
+++ b/conf/broker.ini
@@ -27,7 +27,7 @@ webPort=8081
 ; address list of master HA servers
 masterAddressList=10.2.121.42:8000,10.2.121.42:8000
 ; path to message files
-primaryPath=e:/stage/metadata_1
+primaryPath=var/stage/metadata_1
 ; maximum size of single data file; default is 512M
 maxSegmentSize=1073741824
 ; maximum size of single index file; default is 18M
diff --git a/conf/master.ini b/conf/master.ini
index b4ac859..f3cada3 100644
--- a/conf/master.ini
+++ b/conf/master.ini
@@ -35,7 +35,7 @@ producerHeartbeatTimeoutMs=45000
 brokerHeartbeatTimeoutMs=25000
 ;configure modify authorization_token
 confModAuthToken=abc
-webResourcePath=E:\\GIT\\TubeMQ\\resources
+webResourcePath=resources
 
 [zookeeper]
 ; root path of TubeMQ znodes on ZK
@@ -59,7 +59,7 @@ bdbNodeName=tubemqMasterGroupNode1
 ;port for node to communicate to other nodes in replication group
 bdbNodePort=9001
 ;home directory of node in replication group
-bdbEnvHome=e:/GIT/TubeMQ/tubemqMasterGroup/master_data
+bdbEnvHome=var/tubemqMasterGroup/master_data
 ;helperHost(and port) for node to join replication group the first time
 bdbHelperHost=10.2.121.42:9001
 
diff --git a/resources/velocity.properties b/resources/velocity.properties
index 4b956b3..a4175e6 100644
--- a/resources/velocity.properties
+++ b/resources/velocity.properties
@@ -99,7 +99,7 @@ foreach.provide.scope.control=true
 resource.loader=file
 file.resource.loader.description=Velocity File Resource Loader
 file.resource.loader.class=org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path=E:\\GIT\\TubeMQ\\resources\\templates
+file.resource.loader.path=resources/templates
 file.resource.loader.cache=false
 file.resource.loader.modificationCheckInterval=2
 string.resource.loader.description=Velocity String Resource Loader