Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 4, 2025
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4247f3d
server : add try..catch to places not covered by set_exception_handler
ngxson Feb 3, 2025
dcf3dcd
log_server_request: rm try catch, add reminder
ngxson Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3353,10 +3353,14 @@ static void log_server_request(const httplib::Request & req, const httplib::Resp
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("response: %s\n", res.body.c_str());
LOG_DBG("request: %s\n", req.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());
}
Copy link
Member

@ggerganov ggerganov Feb 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do any of these throw?

Copy link
Collaborator Author

@ngxson ngxson Feb 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, but this is mostly for future-proof.

Indeed, I was a bit doubt when adding this try..catch because I want to communicate to whoever in the future touching this code that "exception is not handled here". Another solution is to just add a TODO, but not sure if it's enough because people may not even read it.

Copy link
Member

@ggerganov ggerganov Feb 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO it's fine to remove the try/catch if it is not currently used.

Copy link
Collaborator Author

@ngxson ngxson Feb 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK I replaced the try catch with a comment

}

std::function<void(int)> shutdown_handler;
Expand Down Expand Up @@ -3439,9 +3443,13 @@ int main(int argc, char ** argv) {
message = "Unknown Exception";
}

json formatted_error = format_error_response(message, ERROR_TYPE_SERVER);
LOG_WRN("got exception: %s\n", formatted_error.dump().c_str());
res_error(res, formatted_error);
try {
json formatted_error = format_error_response(message, ERROR_TYPE_SERVER);
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) {
Expand Down
Loading