minor changes

source/common/src/tglobal.c

@@ -325,6 +325,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
 static void taosSetClientLogCfg(SConfig *pCfg) {
   SConfigItem *pItem = cfgGetItem(pCfg, "logDir");
   tstrncpy(tsLogDir, cfgGetItem(pCfg, "logDir")->str, PATH_MAX);
+  taosExpandDir(tsLogDir, tsLogDir, PATH_MAX);
   tsLogSpace.reserved = cfgGetItem(pCfg, "minimalLogDirGB")->fval;
   tsNumOfLogLines = cfgGetItem(pCfg, "numOfLogLines")->i32;
   tsAsyncLog = cfgGetItem(pCfg, "asyncLog")->bval;
@@ -366,6 +367,7 @@ static void taosSetClientCfg(SConfig *pCfg) {
   cfgSetItem(pCfg, "secondEp", tsSecond, pSecondpItem->stype);
 
   tstrncpy(tsLogDir, cfgGetItem(pCfg, "tempDir")->str, PATH_MAX);
+  taosExpandDir(tsLogDir, tsLogDir, PATH_MAX);
   tsTempSpace.reserved = cfgGetItem(pCfg, "minimalTempDirGB")->fval;
 
   tsNumOfThreadsPerCore = cfgGetItem(pCfg, "maxTmrCtrl")->fval;
@@ -406,6 +408,8 @@ static void taosSetSystemCfg(SConfig *pCfg) {
 
 static void taosSetServerCfg(SConfig *pCfg) {
   tstrncpy(tsDataDir, cfgGetItem(pCfg, "dataDir")->str, PATH_MAX);
+  taosExpandDir(tsDataDir, tsDataDir, PATH_MAX);
+
   tsTempSpace.reserved = cfgGetItem(pCfg, "minimalDataDirGB")->fval;
   tsNumOfCommitThreads = cfgGetItem(pCfg, "numOfCommitThreads")->i32;
   tsRatioOfQueryCores = cfgGetItem(pCfg, "ratioOfQueryCores")->fval;

source/dnode/mgmt/daemon/src/dmnCfg.c

@@ -22,11 +22,11 @@ SDnodeObjCfg dmnGetObjCfg() {
   SDnodeObjCfg objCfg = {0};
 
   objCfg.numOfSupportVnodes = cfgGetItem(pCfg, "supportVnodes")->i32;
-  tstrncpy(objCfg.dataDir, cfgGetItem(pCfg, "dataDir")->str, sizeof(objCfg.dataDir));
-  tstrncpy(objCfg.firstEp, cfgGetItem(pCfg, "firstEp")->str, sizeof(objCfg.firstEp));
-  tstrncpy(objCfg.secondEp, cfgGetItem(pCfg, "secondEp")->str, sizeof(objCfg.firstEp));
-  objCfg.serverPort = (uint16_t)cfgGetItem(pCfg, "serverPort")->i32;
-  tstrncpy(objCfg.localFqdn, cfgGetItem(pCfg, "fqdn")->str, sizeof(objCfg.localFqdn));
+  tstrncpy(objCfg.dataDir, tsDataDir, sizeof(objCfg.dataDir));
+  tstrncpy(objCfg.firstEp, tsFirst, sizeof(objCfg.firstEp));
+  tstrncpy(objCfg.secondEp, tsSecond, sizeof(objCfg.firstEp));
+  objCfg.serverPort = tsServerPort;
+  tstrncpy(objCfg.localFqdn, tsLocalFqdn, sizeof(objCfg.localFqdn));
   snprintf(objCfg.localEp, sizeof(objCfg.localEp), "%s:%u", objCfg.localFqdn, objCfg.serverPort);
   objCfg.pDisks = tsDiskCfg;
   objCfg.numOfDisks = tsDiskCfgNum;