diff --git a/source/dnode/mgmt/node_mgmt/src/dmEnv.c b/source/dnode/mgmt/node_mgmt/src/dmEnv.c index 7e549dcdb81f5bd9e2077835823ec5bb21e4bc21..78c25bc87cc8c9657f36a33342b1b8079caac559 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmEnv.c +++ b/source/dnode/mgmt/node_mgmt/src/dmEnv.c @@ -20,18 +20,18 @@ #define STR_STR_CMP(s, d) (strstr((s), (d))) #define STR_INT_CMP(s, d, c) (taosStr2Int32(s, 0, 10) c(d)) #define STR_STR_SIGN ("ia") -#define DM_INIT_MON() \ - do { \ - code = (int32_t)((2147483648 | ((0) << 7 | (298)))); \ - strncpy(stName, tsVersionName, 64); \ - monCfg.maxLogs = tsMonitorMaxLogs; \ - monCfg.port = tsMonitorPort; \ - monCfg.server = tsMonitorFqdn; \ - monCfg.comp = tsMonitorComp; \ - if (monInit(&monCfg) != 0) { \ - if (terrno != 0) code = terrno; \ - goto _exit; \ - } \ +#define DM_INIT_MON() \ + do { \ + code = (int32_t)(2147483648 | 298); \ + strncpy(stName, tsVersionName, 64); \ + monCfg.maxLogs = tsMonitorMaxLogs; \ + monCfg.port = tsMonitorPort; \ + monCfg.server = tsMonitorFqdn; \ + monCfg.comp = tsMonitorComp; \ + if (monInit(&monCfg) != 0) { \ + if (terrno != 0) code = terrno; \ + goto _exit; \ + } \ } while (0) #define DM_ERR_RTN(c) \ @@ -76,7 +76,7 @@ static int32_t dmInitMonitor() { DM_ERR_RTN(0); } if (taosGetOsReleaseName(reName, stName, ver, 64) != 0) { - goto _exit; + DM_ERR_RTN(code); } if (STR_CASE_CMP(stName, dmOS[0])) { if (STR_INT_CMP(ver, 17, >)) { diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c index e6479abeca5675b66594ea849d5e24f79fb8a85c..6f87f6b75bebb53b0b835ce8c2bcaca64c686a46 100644 --- a/source/os/src/osSysinfo.c +++ b/source/os/src/osSysinfo.c @@ -373,6 +373,7 @@ int32_t taosGetOsReleaseName(char *releaseName, char* sName, char* ver, int32_t dest = sName; } else if (strncmp(line, "PRETTY_NAME", 11) == 0) { dest = releaseName; + code = 0; } else if (strncmp(line, "VERSION_ID", 10) == 0) { dest = ver; } else { @@ -386,10 +387,7 @@ int32_t taosGetOsReleaseName(char *releaseName, char* sName, char* ver, int32_t } tstrncpy(dest, p, maxLen); - if (++cnt >= 3) { - code = 0; - break; - } + if (++cnt >= 3) break; } taosCloseFile(&pFile);