StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove success logs

Browse Source 
Also, we were panic!ing in the Rust codegen whenever there was an
error in the new storage, switch to panic!ing only if the flag
enabling the use of the new value is enabled.

Bug: 312235596
Test: m
Change-Id: Ic15c21a88bb803d89a489c14f91e7fb82114b443
Ignore-AOSP-First: CP afterwards
This commit is contained in:
Ted Bauer
2024-08-07 14:12:11 +00:00
parent e32fdf859d
commit 637690e003
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/aconfig/aconfig/src/codegen/rust.rs
View File

@@ -319,7 +319,6 @@ lazy_static::lazy_static! {
match aconfig_storage_result {
Ok(storage_result) if storage_result == result => {
log!(Level::Info, "AconfigTestMission1: success! flag 'disabled_rw' contained correct value. Legacy storage was {result}, new storage was {storage_result}");
if use_new_storage_value {
return storage_result;
} else {
@@ -336,10 +335,12 @@ lazy_static::lazy_static! {
},
Err(err) => {
log!(Level::Error, "AconfigTestMission1: error: {err}");
if use_new_storage_value {
panic!("failed to read flag value: {err}");
}
}
}
}
result
};
@@ -384,7 +385,6 @@ lazy_static::lazy_static! {
match aconfig_storage_result {
Ok(storage_result) if storage_result == result => {
log!(Level::Info, "AconfigTestMission1: success! flag 'disabled_rw_exported' contained correct value. Legacy storage was {result}, new storage was {storage_result}");
if use_new_storage_value {
return storage_result;
} else {
@@ -401,10 +401,12 @@ lazy_static::lazy_static! {
},
Err(err) => {
log!(Level::Error, "AconfigTestMission1: error: {err}");
if use_new_storage_value {
panic!("failed to read flag value: {err}");
}
}
}
}
result
};
@@ -449,7 +451,6 @@ lazy_static::lazy_static! {
match aconfig_storage_result {
Ok(storage_result) if storage_result == result => {
log!(Level::Info, "AconfigTestMission1: success! flag 'disabled_rw_in_other_namespace' contained correct value. Legacy storage was {result}, new storage was {storage_result}");
if use_new_storage_value {
return storage_result;
} else {
@@ -466,10 +467,12 @@ lazy_static::lazy_static! {
},
Err(err) => {
log!(Level::Error, "AconfigTestMission1: error: {err}");
if use_new_storage_value {
panic!("failed to read flag value: {err}");
}
}
}
}
result
};
@@ -514,7 +517,6 @@ lazy_static::lazy_static! {
match aconfig_storage_result {
Ok(storage_result) if storage_result == result => {
log!(Level::Info, "AconfigTestMission1: success! flag 'enabled_rw' contained correct value. Legacy storage was {result}, new storage was {storage_result}");
if use_new_storage_value {
return storage_result;
} else {
@@ -531,10 +533,12 @@ lazy_static::lazy_static! {
},
Err(err) => {
log!(Level::Error, "AconfigTestMission1: error: {err}");
if use_new_storage_value {
panic!("failed to read flag value: {err}");
}
}
}
}
result
};
@@ -653,7 +657,6 @@ pub fn disabled_ro() -> bool {
log!(Level::Error, "AconfigTestMission1: error: flag mismatch for 'disabled_ro'. Legacy storage was {result}, new storage was {value}");
} else {
let default_value = false;
log!(Level::Info, "AconfigTestMission1: success! flag 'disabled_ro' contained correct value. Legacy storage was {default_value}, new storage was {value}");
}
}
@@ -736,7 +739,6 @@ pub fn enabled_fixed_ro() -> bool {
log!(Level::Error, "AconfigTestMission1: error: flag mismatch for 'enabled_fixed_ro'. Legacy storage was {result}, new storage was {value}");
} else {
let default_value = true;
log!(Level::Info, "AconfigTestMission1: success! flag 'enabled_fixed_ro' contained correct value. Legacy storage was {default_value}, new storage was {value}");
}
}
@@ -801,7 +803,6 @@ pub fn enabled_fixed_ro_exported() -> bool {
log!(Level::Error, "AconfigTestMission1: error: flag mismatch for 'enabled_fixed_ro_exported'. Legacy storage was {result}, new storage was {value}");
} else {
let default_value = true;
log!(Level::Info, "AconfigTestMission1: success! flag 'enabled_fixed_ro_exported' contained correct value. Legacy storage was {default_value}, new storage was {value}");
}
}
@@ -866,7 +867,6 @@ pub fn enabled_ro() -> bool {
log!(Level::Error, "AconfigTestMission1: error: flag mismatch for 'enabled_ro'. Legacy storage was {result}, new storage was {value}");
} else {
let default_value = true;
log!(Level::Info, "AconfigTestMission1: success! flag 'enabled_ro' contained correct value. Legacy storage was {default_value}, new storage was {value}");
}
}
@@ -931,7 +931,6 @@ pub fn enabled_ro_exported() -> bool {
log!(Level::Error, "AconfigTestMission1: error: flag mismatch for 'enabled_ro_exported'. Legacy storage was {result}, new storage was {value}");
} else {
let default_value = true;
log!(Level::Info, "AconfigTestMission1: success! flag 'enabled_ro_exported' contained correct value. Legacy storage was {default_value}, new storage was {value}");
}
}

2
tools/aconfig/aconfig/templates/cpp_source_file.template
View File

@@ -158,8 +158,6 @@ namespace {cpp_namespace} \{
if (*value != expected_value) \{
ALOGI("error: {item.flag_name} value mismatch, new storage value is %s, old storage value is %s",
*value ? "true" : "false", expected_value ? "true" : "false");
} else \{
ALOGI("success: {item.flag_name} value matches");
}
if (use_new_storage_value) \{

4
tools/aconfig/aconfig/templates/rust.template
View File

@@ -67,7 +67,6 @@ lazy_static::lazy_static! \{
match aconfig_storage_result \{
Ok(storage_result) if storage_result == result => \{
log!(Level::Info, "AconfigTestMission1: success! flag '{flag.name}' contained correct value. Legacy storage was \{result}, new storage was \{storage_result}");
if use_new_storage_value \{
return storage_result;
} else \{
@@ -84,10 +83,12 @@ lazy_static::lazy_static! \{
},
Err(err) => \{
log!(Level::Error, "AconfigTestMission1: error: \{err}");
if use_new_storage_value \{
panic!("failed to read flag value: \{err}");
}
}
}
}
result
};
@@ -184,7 +185,6 @@ pub fn {flag.name}() -> bool \{
log!(Level::Error, "AconfigTestMission1: error: flag mismatch for '{flag.name}'. Legacy storage was \{result}, new storage was \{value}");
} else \{
let default_value = {flag.default_value};
log!(Level::Info, "AconfigTestMission1: success! flag '{flag.name}' contained correct value. Legacy storage was \{default_value}, new storage was \{value}");
}
}