Skip to content
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

enable to skip generation of post_upgrade #135

Merged
merged 2 commits into from
Dec 13, 2024
Merged

enable to skip generation of post_upgrade #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e363586
enable to skip generation of post_upgrade
darroze-ar Dec 13, 2024
4217fcd
update snapshot
darroze-ar Dec 13, 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
8 changes: 4 additions & 4 deletions ...dk-macros/src/snapshots/chainsight_cdk_macros__utils__tests__snapshot__define_logger.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ fn drain_logs(rows: usize) -> Vec<String> {
fn init_logger() {
schedule_cleanup();
}
#[ic_cdk::post_upgrade]
fn post_upgrade_logger() {
schedule_cleanup();
}
fn schedule_cleanup() {
ic_cdk_timers::set_timer_interval(std::time::Duration::from_secs(86400u64), || {
ic_cdk::spawn(async {
Expand All @@ -39,3 +35,7 @@ fn schedule_cleanup() {
fn _logger() -> LoggerImpl {
LoggerImpl::new(Some("Logger"))
}
#[ic_cdk::post_upgrade]
fn post_upgrade_logger() {
schedule_cleanup();
}
47 changes: 34 additions & 13 deletions chainsight-cdk-macros/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use proc_macro::TokenStream;
use quote::quote;
use syn::{
parse::{Parse, ParseStream},
parse_macro_input, DeriveInput, LitInt, Result,
parse_macro_input, DeriveInput, LitBool, LitInt, Result,
};

pub fn chainsight_common(_input: TokenStream) -> TokenStream {
Expand All @@ -21,27 +21,35 @@ fn chainsight_common_internal() -> proc_macro2::TokenStream {
struct DefineLoggerArgs {
retention_days: Option<u8>,
cleanup_interval_days: Option<u8>,
disable_post_upgrade: bool,
}
impl Parse for DefineLoggerArgs {
fn parse(input: ParseStream) -> Result<Self> {
if input.is_empty() {
return Ok(DefineLoggerArgs {
retention_days: None,
cleanup_interval_days: None,
});
return Ok(DefineLoggerArgs::default());
}
let retention_days: Option<LitInt> = input.parse()?;
let retention_days = retention_days.map(|x| x.base10_parse::<u8>().unwrap());
if input.parse::<syn::Token![,]>().is_err() {
return Ok(DefineLoggerArgs {
retention_days,
cleanup_interval_days: None,
..Default::default()
});
}
let cleanup_interval_days: Option<LitInt> = input.parse()?;
let cleanup_interval_days = cleanup_interval_days.map(|x| x.base10_parse::<u8>().unwrap());
if input.parse::<syn::Token![,]>().is_err() {
return Ok(DefineLoggerArgs {
retention_days,
cleanup_interval_days,
..Default::default()
});
}
let disable_post_upgrade: Option<LitBool> = input.parse()?;
Ok(DefineLoggerArgs {
retention_days,
cleanup_interval_days: cleanup_interval_days.map(|x| x.base10_parse().unwrap()),
cleanup_interval_days,
disable_post_upgrade: disable_post_upgrade.map(|x| x.value).unwrap_or_default(),
})
}
}
Expand All @@ -53,7 +61,7 @@ pub fn define_logger(input: TokenStream) -> TokenStream {
fn define_logger_internal(args: DefineLoggerArgs) -> proc_macro2::TokenStream {
let retention_days = args.retention_days.unwrap_or(7);
let cleanup_interval = args.cleanup_interval_days.unwrap_or(1) as u64 * 86400;
quote! {
let code = quote! {
use chainsight_cdk::log::{Logger, LoggerImpl};

#[candid::candid_method(query)]
Expand All @@ -74,11 +82,6 @@ fn define_logger_internal(args: DefineLoggerArgs) -> proc_macro2::TokenStream {
schedule_cleanup();
}

#[ic_cdk::post_upgrade]
fn post_upgrade_logger() {
schedule_cleanup();
}

fn schedule_cleanup() {
ic_cdk_timers::set_timer_interval(std::time::Duration::from_secs(#cleanup_interval), || {
ic_cdk::spawn(async {
Expand All @@ -91,6 +94,24 @@ fn define_logger_internal(args: DefineLoggerArgs) -> proc_macro2::TokenStream {
fn _logger() -> LoggerImpl {
LoggerImpl::new(Some("Logger"))
}
};
if args.disable_post_upgrade {
quote! {
#code

fn post_upgrade_logger() {
schedule_cleanup();
}
}
} else {
quote! {
#code

#[ic_cdk::post_upgrade]
fn post_upgrade_logger() {
schedule_cleanup();
}
}
}
}

Expand Down
Loading