Skip to content

Catch exceptions correctly in server.cpp #7642

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

Closed
wants to merge 6 commits into from
Closed

Catch exceptions correctly in server.cpp #7642

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0001ec3
Update server.cpp
0wwafa May 30, 2024
0d358c1
Update server.cpp
0wwafa May 31, 2024
1ac70ba
Update server.cpp
0wwafa Jun 1, 2024
4d78cff
Merge branch 'ggerganov:master' into patches
0wwafa Jun 1, 2024
8dc6f16
Update server.cpp
0wwafa Jun 3, 2024
48b860a
Merge branch 'ggerganov:master' into patches
0wwafa Jun 4, 2024
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
22 changes: 17 additions & 5 deletions examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3039,13 +3039,25 @@ int main(int argc, char ** argv) {
log_data["api_key"] = "api_key: " + std::to_string(sparams.api_keys.size()) + " keys loaded";
}

// load the model
if (!ctx_server.load_model(params)) {
state.store(SERVER_STATE_ERROR);
return 1;
} else {
try {
// Attempt to load the model
if (!ctx_server.load_model(params)) {
LOG_ERROR("unable to load model", {{"error", "Load model failed"}});
Copy link
Collaborator

Choose a reason for hiding this comment

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

Here is why it makes no sense to me: we already catch the unable to load model. Why do we need another try..catch to do that?

Copy link
Author

Choose a reason for hiding this comment

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

because if you do: server -m nonexistantfile the program couses a windows CRASH instead of just exiting with the error.
image

state.store(SERVER_STATE_ERROR);
return 1;
}
// Initialize the server context if the model is loaded successfully
ctx_server.init();
state.store(SERVER_STATE_READY);

} catch (const std::exception &e) {
// Catch known standard exceptions
LOG_ERROR("unable to load model", {{"error", e.what()}});
exit(1);
Copy link
Collaborator

Choose a reason for hiding this comment

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

You forgot to change this.

Copy link
Author

Choose a reason for hiding this comment

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

ok.. I give up... 3 days and still nothing for a simple modification..
also: on windows, the program crashes for every stupid error like putting a non existant model filename.
that just plain wrong.
all exceptions should be caught. mine was only an example.

Copy link
Author

Choose a reason for hiding this comment

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

image

} catch (...) {
// Catch all other exceptions
LOG_ERROR("unable to load model", {{"error", "Unknown Exception"}});
return 1;
}

LOG_INFO("model loaded", {});
Expand Down