vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server : add try..catch to places not covered by set_exception_handler

Browse source
This commit is contained in:
Xuan Son Nguyen 2025-02-03 15:30:08 +01:00
parent 8ec05832fa
commit 4247f3d210
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
examples/server/server.cpp
View file

@ -3353,10 +3353,14 @@ static void log_server_request(const httplib::Request & req, const httplib::Resp
return; return;
} }
LOG_INF("request: %s %s %s %d\n", req.method.c_str(), req.path.c_str(), req.remote_addr.c_str(), res.status); try {
LOG_INF("request: %s %s %s %d\n", req.method.c_str(), req.path.c_str(), req.remote_addr.c_str(), res.status);
LOG_DBG("request: %s\n", req.body.c_str()); LOG_DBG("request: %s\n", req.body.c_str());
LOG_DBG("response: %s\n", res.body.c_str()); LOG_DBG("response: %s\n", res.body.c_str());
} catch (const std::exception & e) {
LOG_ERR("failed to log request/response: %s\n", e.what());
}
} }
std::function<void(int)> shutdown_handler; std::function<void(int)> shutdown_handler;
@ -3439,9 +3443,13 @@ int main(int argc, char ** argv) {
message = "Unknown Exception"; message = "Unknown Exception";
} }
json formatted_error = format_error_response(message, ERROR_TYPE_SERVER); try {
LOG_WRN("got exception: %s\n", formatted_error.dump().c_str()); json formatted_error = format_error_response(message, ERROR_TYPE_SERVER);
res_error(res, formatted_error); LOG_WRN("got exception: %s\n", formatted_error.dump().c_str());
res_error(res, formatted_error);
} catch (const std::exception & e) {
LOG_ERR("got another exception: %s | while hanlding exception: %s\n", e.what(), message.c_str());
}
}); });
svr->set_error_handler([&res_error](const httplib::Request &, httplib::Response & res) { svr->set_error_handler([&res_error](const httplib::Request &, httplib::Response & res) {