liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

more cleanup

Browse Source
This commit is contained in:
John Smith
2022-07-01 16:20:43 -04:00
parent c106d324c8
commit d96e5a131c
15 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
veilid-core/src/veilid_api/mod.rs
View File

@@ -23,7 +23,6 @@ pub use network_manager::NetworkManager;
pub use routing_table::RoutingTable;
pub use rpc_processor::StatusAnswer;
use api_tracing_layer::*;
use core::fmt;
use core_context::{api_shutdown, VeilidCoreContext};
use enumset::*;

8
veilid-core/src/veilid_api/serialize_helpers.rs
View File

@@ -1,7 +1,9 @@
use super::*;
use core::fmt::Debug;
#[instrument(level = "trace", ret, err)]
// XXX: Don't trace these functions as they are used in the transfer of API logs, which will recurse!
// #[instrument(level = "trace", ret, err)]
pub fn deserialize_json<'a, T: de::Deserialize<'a> + Debug>(
arg: &'a str,
) -> Result<T, VeilidAPIError> {
@@ -15,7 +17,7 @@ pub fn deserialize_json<'a, T: de::Deserialize<'a> + Debug>(
})
}
#[instrument(level = "trace", ret, err)]
// #[instrument(level = "trace", ret, err)]
pub fn deserialize_opt_json<T: de::DeserializeOwned + Debug>(
arg: Option<String>,
) -> Result<T, VeilidAPIError> {
@@ -29,7 +31,7 @@ pub fn deserialize_opt_json<T: de::DeserializeOwned + Debug>(
deserialize_json(arg)
}
#[instrument(level = "trace", ret)]
// #[instrument(level = "trace", ret)]
pub fn serialize_json<T: Serialize + Debug>(val: T) -> String {
match serde_json::to_string(&val) {
Ok(v) => v,