Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-11 09:05:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Slightly improved logging (httpserver)

Browse Source
This commit is contained in:
Henrik Rydgård 2025-01-14 12:37:56 +01:00
parent 841eb115e2
commit f2d8d44513
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Common/Net/HTTPServer.cpp
View File

@ -158,18 +158,18 @@ void Server::SetFallbackHandler(UrlHandlerFunc handler) {
fallback_ = handler;
}
bool Server::Listen(int port, net::DNSType type) {
bool Server::Listen(int port, const char *reason, net::DNSType type) {
bool success = false;
if (type == net::DNSType::ANY || type == net::DNSType::IPV6) {
success = Listen6(port, type == net::DNSType::IPV6);
success = Listen6(port, type == net::DNSType::IPV6, reason);
}
if (!success && (type == net::DNSType::ANY || type == net::DNSType::IPV4)) {
success = Listen4(port);
success = Listen4(port, reason);
}
return success;
}
bool Server::Listen4(int port) {
bool Server::Listen4(int port, const char *reason) {
listener_ = socket(AF_INET, SOCK_STREAM, 0);
if (listener_ < 0)
return false;
@ -190,7 +190,7 @@ bool Server::Listen4(int port) {
#else
int err = errno;
#endif
ERROR_LOG(Log::IO, "Failed to bind to port %d, error=%d - Bailing (ipv4)", port, err);
ERROR_LOG(Log::IO, "%s: Failed to bind to port %d, error=%d - Bailing (ipv4)", reason, port, err);
closesocket(listener_);
return false;
}
@ -208,13 +208,13 @@ bool Server::Listen4(int port) {
port = ntohs(server_addr.sin_port);
}
INFO_LOG(Log::IO, "HTTP server started on port %d", port);
INFO_LOG(Log::IO, "HTTP server started on port %d: %s", port, reason);
port_ = port;
return true;
}
bool Server::Listen6(int port, bool ipv6_only) {
bool Server::Listen6(int port, bool ipv6_only, const char *reason) {
#if !PPSSPP_PLATFORM(SWITCH)
listener_ = socket(AF_INET6, SOCK_STREAM, 0);
if (listener_ < 0)
@ -240,7 +240,7 @@ bool Server::Listen6(int port, bool ipv6_only) {
#else
int err = errno;
#endif
ERROR_LOG(Log::IO, "Failed to bind to port %d, error=%d - Bailing (ipv6)", port, err);
ERROR_LOG(Log::IO, "%s: Failed to bind to port %d, error=%d - Bailing (ipv6)", reason, port, err);
closesocket(listener_);
return false;
}
@ -258,7 +258,7 @@ bool Server::Listen6(int port, bool ipv6_only) {
port = ntohs(server_addr.sin6_port);
}
INFO_LOG(Log::IO, "HTTP server started on port %d", port);
INFO_LOG(Log::IO, "HTTP server started on port %d: %s", port, reason);
port_ = port;
return true;
@ -299,7 +299,7 @@ bool Server::RunSlice(double timeout) {
}
bool Server::Run(int port) {
if (!Listen(port)) {
if (!Listen(port, "websocket")) {
return false;
}

6
Common/Net/HTTPServer.h
View File

@ -85,7 +85,7 @@ public:
// May run for (significantly) longer than timeout, but won't wait longer than that
// for a new connection to handle.
bool RunSlice(double timeout);
bool Listen(int port, net::DNSType type = net::DNSType::ANY);
bool Listen(int port, const char *reason, net::DNSType type = net::DNSType::ANY);
void Stop();
void RegisterHandler(const char *url_path, UrlHandlerFunc handler);
@ -101,8 +101,8 @@ public:
}
private:
bool Listen6(int port, bool ipv6_only);
bool Listen4(int port);
bool Listen6(int port, bool ipv6_only, const char *reason);
bool Listen4(int port, const char *reason);
void HandleConnection(int conn_fd);

9
Core/WebServer.cpp
View File

@ -413,9 +413,9 @@ static void ExecuteWebServer() {
http->SetFallbackHandler(&HandleFallback);
http->RegisterHandler("/debugger", &ForwardDebuggerRequest);
if (!http->Listen(g_Config.iRemoteISOPort)) {
if (!http->Listen(0)) {
ERROR_LOG(Log::FileSystem, "Unable to listen on any port");
if (!http->Listen(g_Config.iRemoteISOPort, "debugger-webserver")) {
if (!http->Listen(0, "debugger-webserver")) {
ERROR_LOG(Log::FileSystem, "Unable to listen on any port (debugger - webserver)");
UpdateStatus(ServerStatus::FINISHED);
return;
}
@ -454,7 +454,8 @@ bool StartWebServer(WebServerFlags flags) {
case ServerStatus::FINISHED:
serverThread.join();
// Intentional fallthrough.
[[fallthrough]]; // Intentional fallthrough.
case ServerStatus::STOPPED:
serverStatus = ServerStatus::STARTING;
serverFlags = (int)flags;