Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ members = [
"src/backend/impl",
"src/backend/external_canisters",
"src/backend/logs",
"src/backend/macros",
]

[profile.release]
Expand Down
1 change: 1 addition & 0 deletions src/backend/impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dev = []

[dependencies]
backend_api = { path = "../api" }
backend_macros = { path = "../macros" }
external_canisters = { path = "../external_canisters" }

ic-cdk.workspace = true
Expand Down
2 changes: 2 additions & 0 deletions src/backend/impl/src/controllers/proposal_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ use crate::{
use backend_api::{
ApiError, ApiResult, ListProposalsRequest, ListProposalsResponse, SyncProposalsResponse,
};
use backend_macros::log_errors;
use candid::Principal;
use ic_cdk::*;

#[update]
#[log_errors(crate::services::log_update_call_error)]
async fn sync_proposals() -> ApiResult<SyncProposalsResponse> {
let calling_principal = caller();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use backend_api::{
ApiError, ApiResult, CreateProposalReviewCommitRequest, CreateProposalReviewCommitResponse,
DeleteProposalReviewCommitRequest, UpdateProposalReviewCommitRequest,
};
use backend_macros::log_errors;
use candid::Principal;
use ic_cdk::*;

Expand All @@ -17,6 +18,7 @@ use crate::{
};

#[update]
#[log_errors(crate::services::log_update_call_error)]
async fn create_proposal_review_commit(
request: CreateProposalReviewCommitRequest,
) -> ApiResult<CreateProposalReviewCommitResponse> {
Expand All @@ -29,6 +31,7 @@ async fn create_proposal_review_commit(
}

#[update]
#[log_errors(crate::services::log_update_call_error)]
async fn update_proposal_review_commit(
request: UpdateProposalReviewCommitRequest,
) -> ApiResult<()> {
Expand All @@ -40,6 +43,7 @@ async fn update_proposal_review_commit(
}

#[update]
#[log_errors(crate::services::log_update_call_error)]
async fn delete_proposal_review_commit(
request: DeleteProposalReviewCommitRequest,
) -> ApiResult<()> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ use backend_api::{
GetMyProposalReviewSummaryResponse, GetProposalReviewRequest, GetProposalReviewResponse,
ListProposalReviewsRequest, ListProposalReviewsResponse, UpdateProposalReviewRequest,
};
use backend_macros::log_errors;
use candid::Principal;
use ic_cdk::*;

#[update]
#[log_errors(crate::services::log_update_call_error)]
async fn create_proposal_review(
request: CreateProposalReviewRequest,
) -> ApiResult<CreateProposalReviewResponse> {
Expand All @@ -32,6 +34,7 @@ async fn create_proposal_review(
}

#[update]
#[log_errors(crate::services::log_update_call_error)]
fn update_proposal_review(request: UpdateProposalReviewRequest) -> ApiResult<()> {
let calling_principal = caller();

Expand Down Expand Up @@ -61,6 +64,7 @@ fn get_proposal_review(request: GetProposalReviewRequest) -> ApiResult<GetPropos
}

#[update]
#[log_errors(crate::services::log_update_call_error)]
async fn create_proposal_review_image(
request: CreateProposalReviewImageRequest,
) -> ApiResult<CreateProposalReviewImageResponse> {
Expand All @@ -73,6 +77,7 @@ async fn create_proposal_review_image(
}

#[update]
#[log_errors(crate::services::log_update_call_error)]
fn delete_proposal_review_image(request: DeleteProposalReviewImageRequest) -> ApiResult<()> {
let calling_principal = caller();

Expand Down
4 changes: 4 additions & 0 deletions src/backend/impl/src/controllers/user_profile_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use backend_api::{
GetMyUserProfileResponse, ListReviewerProfilesResponse, UpdateMyUserProfileRequest,
UpdateUserProfileRequest,
};
use backend_macros::log_errors;
use candid::Principal;
use ic_cdk::*;

Expand Down Expand Up @@ -38,6 +39,7 @@ fn get_my_user_profile_history() -> ApiResult<GetMyUserProfileHistoryResponse> {
}

#[update]
#[log_errors(crate::services::log_update_call_error)]
async fn create_my_user_profile() -> ApiResult<CreateMyUserProfileResponse> {
let calling_principal = caller();

Expand All @@ -48,6 +50,7 @@ async fn create_my_user_profile() -> ApiResult<CreateMyUserProfileResponse> {
}

#[update]
#[log_errors(crate::services::log_update_call_error)]
fn update_my_user_profile(request: UpdateMyUserProfileRequest) -> ApiResult<()> {
let calling_principal = caller();

Expand All @@ -57,6 +60,7 @@ fn update_my_user_profile(request: UpdateMyUserProfileRequest) -> ApiResult<()>
}

#[update]
#[log_errors(crate::services::log_update_call_error)]
async fn update_user_profile(request: UpdateUserProfileRequest) -> ApiResult<()> {
let calling_principal = caller();

Expand Down
18 changes: 18 additions & 0 deletions src/backend/impl/src/services/log_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,24 @@ impl<T: LogRepository> LogServiceImpl<T> {
}
}

/// Mainly used with the `log_errors` macro.
///
/// # Example
/// ```
/// use ic_cdk::update;
/// use backend_macros::log_errors;
///
/// #[update]
/// #[log_errors(crate::services::log_update_call_error)]
/// async fn create_proposal_review() -> ApiResult<()> {
/// Ok(())
/// }
/// ```
pub fn log_update_call_error(message: String, context: String) {
// We can ignore this error
let _ = LogServiceImpl::default().log_error(message, Some(context));
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
13 changes: 13 additions & 0 deletions src/backend/macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "backend_macros"
version = "0.1.0"
edition = "2021"

[lib]
proc-macro = true

[dependencies]
backend_api = { path = "../api" }

syn = "2.0"
quote = "1.0"
44 changes: 44 additions & 0 deletions src/backend/macros/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
extern crate proc_macro;
use proc_macro::TokenStream;
use quote::quote;
use syn::{parse_macro_input, ItemFn, Path, ReturnType};

#[proc_macro_attribute]
pub fn log_errors(attr: TokenStream, item: TokenStream) -> TokenStream {
let log_fn = parse_macro_input!(attr as Path);

let input = parse_macro_input!(item as ItemFn);
let fn_name = &input.sig.ident;
let fn_args = &input.sig.inputs;
let fn_return_type = &input.sig.output;
let fn_block = &input.block;
let fn_async = &input.sig.asyncness;

// Ensure the function returns a Result
let result = match fn_return_type {
ReturnType::Type(_, _) => {
let block = if fn_async.is_some() {
quote! { (async { #fn_block }).await }
} else {
quote! { (|| #fn_block)() }
};

quote! {
#fn_async fn #fn_name(#fn_args) #fn_return_type {
let result = #block;
if let backend_api::ApiResult::Err(ref e) = result {
let message = e.to_string();
let context = stringify!(#fn_name);
#log_fn(message, context.to_string());
}
result
}
}
}
_ => quote! {
compile_error!("The log_errors macro can only be applied to functions that return a Result.");
},
};

result.into()
}
Loading