Skip to content

Commit

Permalink
打印 Windows 进程退出码
Browse files Browse the repository at this point in the history
  • Loading branch information
lanthora committed Dec 1, 2023
1 parent 9a9c6c2 commit 8304163
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/core/client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ void Client::handleWebSocketMessage() {
}
if (error < 0) {
spdlog::critical("webSocket client read failed: error {}", error);
Candy::shutdown();
break;
}
if (message.type == WebSocketMessageType::Message) {
Expand Down Expand Up @@ -231,15 +232,16 @@ void Client::handleWebSocketMessage() {
// 连接断开,可能是地址冲突,触发正常退出进程的流程
if (message.type == WebSocketMessageType::Close) {
spdlog::info("client websocket close: {}", message.buffer);
Candy::shutdown();
break;
}
// 通信出现错误,触发正常退出进程的流程
if (message.type == WebSocketMessageType::Error) {
spdlog::critical("client websocket error: {}", message.buffer);
Candy::shutdown();
break;
}
}
Candy::shutdown();
return;
}

Expand All @@ -255,6 +257,7 @@ void Client::handleTunMessage() {
}
if (error < 0) {
spdlog::critical("tun read failed. error {}", error);
Candy::shutdown();
break;
}
if (buffer.length() < sizeof(IPv4Header)) {
Expand Down Expand Up @@ -298,7 +301,6 @@ void Client::handleTunMessage() {
message.buffer.append(buffer);
ws.write(message);
}
Candy::shutdown();
return;
}

Expand Down
3 changes: 2 additions & 1 deletion src/core/server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ void Server::handleWebSocketMessage() {
}
if (error < 0) {
spdlog::error("websocket server read failed: error {}", error);
Candy::shutdown();
break;
}

Expand Down Expand Up @@ -136,10 +137,10 @@ void Server::handleWebSocketMessage() {
}
if (message.type == WebSocketMessageType::Error) {
spdlog::critical("server websocket error: {}", message.buffer);
Candy::shutdown();
break;
}
}
Candy::shutdown();
return;
}

Expand Down
1 change: 1 addition & 0 deletions src/main/windows.cc
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ int main() {
windowsNetworkCleanup();

spdlog::info("service stopped successfully");
spdlog::info("exit code: {}", exitCode);
return exitCode;
}

Expand Down

0 comments on commit 8304163

Please sign in to comment.