From 5d449964e0840ea969b405c9995a6ae1b6beece6 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 26 一月 2021 18:43:43 +0800
Subject: [PATCH] update
---
src/socket/bus_server_socket.cpp | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/socket/bus_server_socket.cpp b/src/socket/bus_server_socket.cpp
index fc684c1..7354f53 100644
--- a/src/socket/bus_server_socket.cpp
+++ b/src/socket/bus_server_socket.cpp
@@ -199,15 +199,13 @@
subscripter_set = map_iter->second;
for(set_iter = subscripter_set->begin(); set_iter != subscripter_set->end(); set_iter++) {
send_key = *set_iter;
- // printf("_proxy_pub send before %d \n", send_key);
- if (shm_sendto(shm_socket, buf, size, send_key, &timeout) == EBUS_CLOSED ) {
+// logger->debug("_proxy_pub send before %d \n", send_key);
+ if (shm_sendto(shm_socket, buf, size, send_key, &timeout, BUS_TIMEOUT_FLAG) == EBUS_CLOSED ) {
//瀵规柟宸插叧闂殑杩炴帴鏀惧埌寰呭垹闄ら槦鍒楅噷銆傚鏋滅洿鎺ュ垹闄や細璁﹊ter鎸囬拡鍑虹幇閿欎贡
subscripter_to_del.push_back(send_key);
} else {
-// printf("_proxy_pub send after: %d \n", send_key);
+// logger->debug("_proxy_pub send after: %d \n", send_key);
}
-
-
}
// 鍒犻櫎宸插叧闂殑绔�
@@ -231,17 +229,17 @@
bus_head_t head;
const char *topic_delim = ",";
-// printf("run_pubsub_proxy server receive before\n");
+// logger.debug("run_pubsub_proxy server receive before\n");
while(shm_recvfrom(shm_socket, (void **)&buf, &size, &key) == 0) {
-// printf("run_pubsub_proxy server recvfrom %d after: %s \n", key, buf);
+// logger.debug("run_pubsub_proxy server recvfrom %d after: %s \n", key, buf);
head = ShmModSocket::decode_bus_head(buf);
topics = buf + BUS_HEAD_SIZE;
action = head.action;
- // printf("run_pubsub_proxy : %s\n", action);
+// logger.debug("run_pubsub_proxy : %s\n", action);
if(strcmp(action, "sub") == 0) {
// 璁㈤槄鏀寔澶氫富棰樿闃�
topic = strtok(topics, topic_delim);
-// printf("run_pubsub_proxy topic = %s\n", topic);
+// logger.debug("run_pubsub_proxy topic = %s\n", topic);
while(topic) {
_proxy_sub(trim(topic, 0), key);
topic = strtok(NULL, topic_delim);
@@ -249,7 +247,7 @@
}
else if(strcmp(action, "desub") == 0) {
-// printf("desub topic=%s,%s,%d\n", topics, trim(topics, 0), strcmp(trim(topics, 0), ""));
+// logger.debug("desub topic=%s,%s,%d\n", topics, trim(topics, 0), strcmp(trim(topics, 0), ""));
if(strcmp(trim(topics, 0), "") == 0) {
// 鍙栨秷鎵�鏈夎闃�
_proxy_desub_all(key);
--
Gitblit v1.8.0