From c32067013aac97db12018efd2e13decf97b8ff5e Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Mon, 23 Sep 2019 21:14:20 -0700 Subject: [PATCH] fix warning + add redis server logging --- ixsnake/ixsnake/IXRedisServer.cpp | 6 ++++++ ixwebsocket/IXSocketServer.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ixsnake/ixsnake/IXRedisServer.cpp b/ixsnake/ixsnake/IXRedisServer.cpp index 9577d065..6358129f 100644 --- a/ixsnake/ixsnake/IXRedisServer.cpp +++ b/ixsnake/ixsnake/IXRedisServer.cpp @@ -195,6 +195,12 @@ namespace ix tokens.push_back(readResult.second); } + for (auto&& token : tokens) + { + std::cerr << token << " "; + } + std::cerr << std::endl; + return true; } diff --git a/ixwebsocket/IXSocketServer.h b/ixwebsocket/IXSocketServer.h index ee7df1b4..f48bb9bb 100644 --- a/ixwebsocket/IXSocketServer.h +++ b/ixwebsocket/IXSocketServer.h @@ -58,8 +58,6 @@ namespace ix void stopAcceptingConnections(); - std::atomic _stop; - private: // Member variables int _port; @@ -70,6 +68,8 @@ namespace ix // socket for accepting connections int _serverFd; + std::atomic _stop; + std::mutex _logMutex; // background thread to wait for incoming connections