diff --git a/bin/build_linux.sh b/bin/build_linux.sh index 19e825379..0ece25ba6 100755 --- a/bin/build_linux.sh +++ b/bin/build_linux.sh @@ -2,6 +2,7 @@ CGO_ENABLED=0 GO111MODULE=on GOOS=linux cd ../ +go build -o ./bin/cmd ./services/cmd/main.go go build -o ./bin/mainte ./services/mainte/main.go go build -o ./bin/gateway ./services/gateway/main.go go build -o ./bin/worker ./services/worker/main.go diff --git a/bin/gm.json b/bin/gm.json index 5c8ef9ed1..d768ccf95 100644 --- a/bin/gm.json +++ b/bin/gm.json @@ -1,47 +1,47 @@ { - "AreaId": "dfli01", + "AreaId": "df03", "ConsulAddr": [ "10.0.0.9:10012" ], "IsCross": false, - "BelongCrossServerId": "dflicross01", + "BelongCrossServerId": "dfcross_2", "LoaclDB": { "RedisIsCluster": false, - "RedisAddr": "10.0.0.9:10011", + "RedisAddr": ["10.0.0.9:10011"], "RedisPassword": "li13451234", - "RedisDB": 5, + "RedisDB": 3, "MongodbUrl": "mongodb://10.0.0.9:10013", - "MongodbDatabase": "dreamfactory5" + "MongodbDatabase": "dreamfactory3" }, "CrossDB": { "RedisIsCluster": false, - "RedisAddr": "10.0.0.9:10011", + "RedisAddr": ["10.0.0.9:10011"], "RedisPassword": "li13451234", - "RedisDB": 6, + "RedisDB": 12, "MongodbUrl": "mongodb://10.0.0.9:10013", - "MongodbDatabase": "dreamfactory6" + "MongodbDatabase": "dreamfactory12" }, "Services": [ { "ServiceType": "gateway", "Host": "127.0.0.1", - "Port": 9567, + "Port": 9571, "Loglevel": 5, "MaxAgeTime": 7, - "ListenPort": 7891 + "ListenPort": 7895 }, { "ServiceType": "mainte", "Host": "127.0.0.1", - "Port": 9568, + "Port": 9572, "Loglevel": 5, "MaxAgeTime": 7, - "ListenPort": 8000 + "ListenPort": 7896 }, { "ServiceType": "worker", "Host": "127.0.0.1", - "Port": 9569, + "Port": 9573, "Loglevel": 5, "MaxAgeTime": 7 } diff --git a/bin/stup.sh b/bin/stup.sh index b24bc4c4e..ceed5aff4 100755 --- a/bin/stup.sh +++ b/bin/stup.sh @@ -4,12 +4,11 @@ start(){ echo "starting $SERVICE..." - - num=`ps -ef | grep $SERVICE | grep -v grep | wc -l` + num=`ps -ef | grep conf | grep $SERVICE | grep -v grep | grep -v /bin/bash | wc -l` if [ $num -eq 0 ] then - nohup $CMD > /dev/null 2>&1 & - #nohup $CMD > $SERVICE.log 2>&1 & + # nohup $CMD > /dev/null 2>&1 & + nohup $CMD > $SERVICE.log 2>&1 & if [ $? -ne 0 ] then echo "start failed, please check the log!"