From 14be935a4f8231233487d510c8db0b544bcf0f69 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 17:40:29 +0800
Subject: [PATCH] fix conflict
---
src/net/net_mod_server_socket.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/socket/net_mod_server_socket.cpp b/src/net/net_mod_server_socket.cpp
similarity index 99%
rename from src/socket/net_mod_server_socket.cpp
rename to src/net/net_mod_server_socket.cpp
index 8324d6f..432defb 100644
--- a/src/socket/net_mod_server_socket.cpp
+++ b/src/net/net_mod_server_socket.cpp
@@ -54,7 +54,7 @@
sprintf(portstr, "%d", port);
listenfd = open_listenfd(portstr);
if(listenfd < 0) {
- LoggerFactory::getLogger()->error(errno, "NetModServerSocket::start . errno=%d ", errno);
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::start. port = %d ", port);
return -1;
}
init_pool(listenfd);
--
Gitblit v1.8.0