xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #2369 from taosdata/hotfix/crash 

change some log
This commit is contained in:
Shengliang Guan 2020-06-19 21:28:10 +08:00 committed by GitHub
parent c8377631f8 0d23f3c33c
commit 0f20457105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/mqtt/src/mqttSystem.c
View File

@ -122,12 +122,11 @@ void mqttCleanUpSystem() {
} }
void mqtt_PublishCallback(void** unused, struct mqtt_response_publish* published) { void mqtt_PublishCallback(void** unused, struct mqtt_response_publish* published) {
mqttPrint("mqtt_PublishCallback");
/* note that published->topic_name is NOT null-terminated (here we'll change it to a c-string) */ /* note that published->topic_name is NOT null-terminated (here we'll change it to a c-string) */
char* topic_name = (char*)malloc(published->topic_name_size + 1); char* topic_name = (char*)malloc(published->topic_name_size + 1);
memcpy(topic_name, published->topic_name, published->topic_name_size); memcpy(topic_name, published->topic_name, published->topic_name_size);
topic_name[published->topic_name_size] = '\0'; topic_name[published->topic_name_size] = '\0';
mqttPrint("Received publish('%s'): %s", topic_name, (const char*)published->application_message); mqttPrint("received publish('%s'): %s", topic_name, (const char*)published->application_message);
char _token[128] = {0}; char _token[128] = {0};
char _dbname[128] = {0}; char _dbname[128] = {0};
char _tablename[128] = {0}; char _tablename[128] = {0};
@ -166,12 +165,12 @@ void* mqttClientRefresher(void* client) {
mqtt_sync((struct mqtt_client*)client); mqtt_sync((struct mqtt_client*)client);
taosMsleep(100); taosMsleep(100);
} }
mqttPrint("Exit mqttClientRefresher"); mqttTrace("quit refresher");
return NULL; return NULL;
} }
void mqttCleanup(int status, int sockfd, pthread_t* client_daemon) { void mqttCleanup(int status, int sockfd, pthread_t* client_daemon) {
mqttPrint("mqttCleanup"); mqttPrint("clean up mqtt module");
if (sockfd != -1) close(sockfd); if (sockfd != -1) close(sockfd);
if (client_daemon != NULL) pthread_cancel(*client_daemon); if (client_daemon != NULL) pthread_cancel(*client_daemon);
} }
@ -197,7 +196,7 @@ void mqttQueryInsertCallback(void* param, TAOS_RES* result, int32_t code) {
} }
void mqttReconnectClient(struct mqtt_client* client, void** reconnect_state_vptr) { void mqttReconnectClient(struct mqtt_client* client, void** reconnect_state_vptr) {
mqttPrint("mqttReconnectClient"); mqttPrint("reconnect client");
struct reconnect_state_t* reconnect_state = *((struct reconnect_state_t**)reconnect_state_vptr); struct reconnect_state_t* reconnect_state = *((struct reconnect_state_t**)reconnect_state_vptr);
/* Close the clients socket if this isn't the initial reconnect call */ /* Close the clients socket if this isn't the initial reconnect call */
@ -213,7 +212,7 @@ void mqttReconnectClient(struct mqtt_client* client, void** reconnect_state_vptr
/* Open a new socket. */ /* Open a new socket. */
int sockfd = open_nb_socket(reconnect_state->hostname, reconnect_state->port); int sockfd = open_nb_socket(reconnect_state->hostname, reconnect_state->port);
if (sockfd == -1) { if (sockfd == -1) {
mqttError("Failed to open socket: "); mqttError("failed to open socket: ");
mqttCleanup(EXIT_FAILURE, sockfd, NULL); mqttCleanup(EXIT_FAILURE, sockfd, NULL);
} }