fix linux compiler warning & bug

TarsCloud · Mar 31, 2020 · 54830dd · 54830dd
1 parent 606c7e3
commit 54830dd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/NodeServer/CommandStart.h b/NodeServer/CommandStart.h
@@ -127,13 +127,13 @@ inline ServerCommand::ExeStatus CommandStart::canExecute(string& sResult)
 
 inline bool CommandStart::startByScript(string& sResult)
 {
-    int64_t iPid = -1;
+    // int64_t iPid = -1;
     bool bSucc = false;
     string sStartScript     = _serverObjectPtr->getStartScript();
     string sMonitorScript   = _serverObjectPtr->getMonitorScript();
 
     string sServerId    = _serverObjectPtr->getServerId();
-    iPid = _serverObjectPtr->getActivator()->activate(sStartScript, sMonitorScript, sResult);
+    _serverObjectPtr->getActivator()->activate(sStartScript, sMonitorScript, sResult);
 
     // vector<string> vtServerName =  TC_Common::sepstr<string>(sServerId, ".");
     // if (vtServerName.size() != 2)

diff --git a/NodeServer/ServerObject.cpp b/NodeServer/ServerObject.cpp
@@ -721,7 +721,7 @@ void ServerObject::doMonScript()
                  }
             }
         }
-        else
+        else if(_startScript.empty() || isTarsServer() == false)
         {
             int64_t pid = savePid();
             if(pid >= 0)

diff --git a/NodeServer/ServerObject.h b/NodeServer/ServerObject.h
@@ -510,7 +510,7 @@ class ServerObject : public TC_ThreadRecLock, public TC_HandleBase
     PatchInfo           _patchInfo;            //下载信息
 
 private:
-    int64_t               _pid;                  //服务进程号
+    int64_t             _pid;                  //服务进程号
     string              _version;              //TARS版本
     NodeInfo            _nodeInfo;             //服务所在node信息
     TC_Endpoint         _localEndpoint;        //本地socket

diff --git a/deploy/tars-install.sh b/deploy/tars-install.sh
@@ -482,7 +482,12 @@ fi
 
 LOG_INFO "copy framework to install path"
 
-${TARS_PATH}/tarsnode/util/stop.bat 
+if [ $OS == 3 ]; then
+    if [ -f ${TARS_PATH}/tarsnode/util/stop.bat ]; then
+        ${TARS_PATH}/tarsnode/util/stop.bat 
+    fi
+fi
+
 sleep 1
 for var in $TARS;
 do

diff --git a/tars-client/CMakeLists.txt b/tars-client/CMakeLists.txt
@@ -1,6 +1,10 @@
 
 include_directories(${CMAKE_SOURCE_DIR}/tarscpp/util/include)
+
+if(WIN32)
 include_directories(${CMAKE_SOURCE_DIR}/tarscpp/util/src/epoll_windows)
+endif(WIN32)
+
 include_directories(${CMAKE_SOURCE_DIR}/tarscpp/servant/protocol)
 
 set(MODULE tars-client)