GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Throw std::strings on sync server errors (#3362)

Browse source
This commit is contained in:
Dustin J. Mitchell 2024-04-15 21:49:17 -04:00 • committed by GitHub
parent 0a491f36ad
commit 9040a7eb79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tc/Server.cpp
View file

@ -39,7 +39,7 @@ tc::Server::new_local (const std::string &server_dir)
TCString error; TCString error;
auto tcserver = tc_server_new_local (tc_server_dir, &error); auto tcserver = tc_server_new_local (tc_server_dir, &error);
if (!tcserver) { if (!tcserver) {
auto errmsg = format ("Could not configure local server at {1}: {2}", std::string errmsg = format ("Could not configure local server at {1}: {2}",
server_dir, tc_string_content (&error)); server_dir, tc_string_content (&error));
tc_string_free (&error); tc_string_free (&error);
throw errmsg; throw errmsg;
@ -61,13 +61,13 @@ tc::Server::new_sync (const std::string &origin, const std::string &client_id, c
if (tc_uuid_from_str(tc_client_id, &tc_client_uuid) != TC_RESULT_OK) { if (tc_uuid_from_str(tc_client_id, &tc_client_uuid) != TC_RESULT_OK) {
tc_string_free(&tc_origin); tc_string_free(&tc_origin);
tc_string_free(&tc_encryption_secret); tc_string_free(&tc_encryption_secret);
throw "client_id must be a valid UUID"; throw format ("client_id '{1}' is not a valid UUID", client_id);
} }
TCString error; TCString error;
auto tcserver = tc_server_new_sync (tc_origin, tc_client_uuid, tc_encryption_secret, &error); auto tcserver = tc_server_new_sync (tc_origin, tc_client_uuid, tc_encryption_secret, &error);
if (!tcserver) { if (!tcserver) {
auto errmsg = format ("Could not configure connection to server at {1}: {2}", std::string errmsg = format ("Could not configure connection to server at {1}: {2}",
origin, tc_string_content (&error)); origin, tc_string_content (&error));
tc_string_free (&error); tc_string_free (&error);
throw errmsg; throw errmsg;
@ -88,7 +88,7 @@ tc::Server::new_gcp (const std::string &bucket, const std::string &credential_pa
TCString error; TCString error;
auto tcserver = tc_server_new_gcp (tc_bucket, tc_credential_path, tc_encryption_secret, &error); auto tcserver = tc_server_new_gcp (tc_bucket, tc_credential_path, tc_encryption_secret, &error);
if (!tcserver) { if (!tcserver) {
auto errmsg = format ("Could not configure connection to GCP bucket {1}: {2}", std::string errmsg = format ("Could not configure connection to GCP bucket {1}: {2}",
bucket, tc_string_content (&error)); bucket, tc_string_content (&error));
tc_string_free (&error); tc_string_free (&error);
throw errmsg; throw errmsg;