From 124011574583b980c1794a1de4e61b39f73f1f11 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 14 一月 2021 16:44:49 +0800
Subject: [PATCH] Merge branch 'dev' into rdma
---
src/queue/lock_free_queue.h | 2 +-
src/socket/shm_socket.cpp | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index 338e868..4c55f7b 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -355,7 +355,7 @@
else if(errno == EINTR)
continue;
else {
- // LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop_timeout %d", errno);
+ LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop_timeout %d", errno);
return errno;
}
}
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 0e5e2fb..672a9a7 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -387,7 +387,7 @@
mm_free(dest.buf);
if(rv == EBUS_TIMEOUT) {
// bus_errno = EBUS_TIMEOUT;
- logger->error(rv, "sendto key %d failed, %s", key, bus_strerror(EBUS_TIMEOUT));
+ // logger->error("sendto key %d failed, %s", key, bus_strerror(EBUS_TIMEOUT));
return EBUS_TIMEOUT;
} else {
//logger->error(errno, "sendto key %d failed!", key);
@@ -459,11 +459,10 @@
} else {
if(rv == EBUS_TIMEOUT) {
- // bus_errno = EBUS_TIMEOUT;
- logger->error("shm_recvfrom failed, %s", bus_strerror(EBUS_TIMEOUT));
+ // logger->error("shm_recvfrom failed, %s", bus_strerror(EBUS_TIMEOUT));
return EBUS_TIMEOUT;
} else {
- logger->error(rv, "shm_recvfrom failed!");
+ // logger->error(rv, "shm_recvfrom failed!");
return rv;
}
--
Gitblit v1.8.0