Merge branch 'release/s113' of https://github.com/taosdata/TDengine i…

…nto release/s113
taosdata · Jan 30, 2021 · f3ffd0a · f3ffd0a
2 parents 3106539 + 03f232f
commit f3ffd0a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
@@ -216,7 +216,6 @@ void taos_cleanup(void) {
   taosCloseRef(id);
 
   taosCleanupKeywordsTable();
-  taosCloseLog();
 
   p = tscRpcCache; 
   tscRpcCache = NULL;
@@ -226,7 +225,10 @@ void taos_cleanup(void) {
     pthread_mutex_destroy(&rpcObjMutex);
   }
 
-  if (tscEmbedded == 0) rpcCleanup();
+  if (tscEmbedded == 0) {
+    taosCloseLog();
+    rpcCleanup();
+  } 
 
   p = tscTmr;
   tscTmr = NULL;

diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
@@ -364,10 +364,10 @@ void *taosInitTcpClient(uint32_t ip, uint16_t port, char *label, int numOfThread
 }
 
 void taosStopTcpClient(void *chandle) {
-  SThreadObj *pThreadObj = chandle;
-  if (pThreadObj == NULL) return;
+  SClientObj *pClientObj = chandle;
+  if (pClientObj == NULL) return;
 
-  tDebug ("%s TCP client is stopped", pThreadObj->label);
+  tDebug ("%s TCP client is stopped", pClientObj->label);
 }
 
 void taosCleanUpTcpClient(void *chandle) {