homeburger/accordion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated logger to support std::format (upgrading to gcc >13 was one of the most tedious things i've ever done)

Browse Source
This commit is contained in:
Blitblank
2026-07-18 03:42:43 -05:00
parent 235530c03d
commit 1c74c04db3
6 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/TcpServer.cpp
View File

@@ -54,7 +54,7 @@ ErrorCode TcpServer::init() {
memset(buffer, 0x0, sizeof(buffer));
listen(socketFd, 10);
logger_->log("TcpServer", LogFlag::Debug, "Server listening...");
logger_->log("TcpServer", LogFlag::Debug, "Server listening on port {}...", configuration_.port);
unsigned int sinSize = sizeof(struct sockaddr);
clientFd = accept(socketFd, (struct sockaddr*)&clientAddress, &sinSize);
@@ -66,20 +66,17 @@ ErrorCode TcpServer::init() {
struct sockaddr_in peerAddress;
unsigned int len = sizeof(peerAddress);
char serverIp[20];
std::string msg = "Accept socket... Client address: " + std::string(inet_ntoa(clientAddress.sin_addr)) + " Port: " + std::to_string(ntohs(clientAddress.sin_port));
logger_->log("TcpServer", LogFlag::Debug, msg);
logger_->log("TcpServer", LogFlag::Debug, "Accept socket... Client address: {} Port: {}", inet_ntoa(clientAddress.sin_addr), ntohs(clientAddress.sin_port));
getsockname(clientFd, (struct sockaddr*)&peerAddress, &len);
inet_ntop(AF_INET, &peerAddress, serverIp, sizeof(serverIp));
msg = "Accept socket... Server address: " + std::string(serverIp);
logger_->log("TcpServer", LogFlag::Debug, msg);
logger_->log("TcpServer", LogFlag::Debug, "Accept socket... Server address: {}", serverIp);
receiveBytes = recv(clientFd, buffer, sizeof(buffer), 0);
if(receiveBytes < 0) {
logger_->log("TcpServer", LogFlag::Error, "Unable to receive from client.");
return ErrorCode::Error;
}
msg = "Received " + std::to_string(receiveBytes) + " bytes from client: " + std::to_string(buffer[2]);
logger_->log("TcpClient", LogFlag::Debug, msg);
logger_->log("TcpClient", LogFlag::Debug, "Received {} bytes from client: 0x{:x}", receiveBytes, buffer[2]);
// echo back
sendBytes = send(clientFd, buffer, sizeof(buffer), 0);
@@ -87,7 +84,7 @@ ErrorCode TcpServer::init() {
logger_->log("TcpServer", LogFlag::Error, "Unable to send to client.");
return ErrorCode::Error;
}
msg = "Echoed " + std::to_string(sendBytes) + " bytes back to client.";
logger_->log("TcpClient", LogFlag::Debug, "Echoed {} bytes back to the client.", sendBytes);
close(socketFd);