From 2744d86c7f863eb2816c4475814ccef08a8094b8 Mon Sep 17 00:00:00 2001 From: vms Date: Mon, 1 Mar 2021 11:09:41 +0300 Subject: [PATCH] Fix logger (#72) --- Cargo.lock | 211 ++++++++---------- crates/interpreter-interface/Cargo.toml | 2 +- crates/polyplets/Cargo.toml | 2 +- crates/test-module/Cargo.toml | 2 +- crates/test-utils/Cargo.toml | 4 +- interpreter-lib/Cargo.toml | 4 +- interpreter-lib/src/execution/air/call.rs | 2 +- interpreter-lib/tests/security_tetraplets.rs | 9 +- .../auth_module/Cargo.toml | 2 +- .../log_storage/Cargo.toml | 2 +- interpreter/Cargo.toml | 2 +- interpreter/src/fce.rs | 17 -- interpreter/src/logger.rs | 5 +- interpreter/src/wasm_bindgen.rs | 8 +- 14 files changed, 112 insertions(+), 160 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3adfc76d..9d7b2de1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,7 +45,7 @@ checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" name = "aqua-interpreter-interface" version = "0.3.1" dependencies = [ - "fluence", + "fluence 0.4.2", "fluence-it-types", "serde", ] @@ -56,7 +56,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c49b8a5fe1336a9c6981be09cb13706c7d9083e48588d692120b5080a13278" dependencies = [ - "fluence", + "fluence 0.2.18", "fluence-it-types", "serde", ] @@ -65,7 +65,7 @@ dependencies = [ name = "aqua-test-module" version = "0.1.0" dependencies = [ - "fluence", + "fluence 0.4.2", ] [[package]] @@ -73,7 +73,7 @@ name = "aqua-test-utils" version = "0.1.0" dependencies = [ "aquamarine-vm", - "fluence", + "fluence 0.4.2", "serde_json", ] @@ -81,7 +81,7 @@ dependencies = [ name = "aquamarine" version = "0.7.0" dependencies = [ - "fluence", + "fluence 0.4.2", "interpreter-lib", "log", "serde", @@ -91,12 +91,12 @@ dependencies = [ [[package]] name = "aquamarine-vm" -version = "0.3.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170e51ff427660612f237ce4d3e4fd28218f080e97fcfc23ebd587bdac3379fa" +checksum = "93ba3f6550b35f2b8aca0abb9de64744c0d50a8bc58ed14509e8456a74a2efa8" dependencies = [ "aqua-interpreter-interface 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fluence-faas 0.2.0", + "fluence-faas", "log", "maplit", "parking_lot 0.11.1", @@ -252,9 +252,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.6.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099e596ef14349721d9016f6b80dd3419ea1bf289ab9b44df8e4dfd3a005d5d9" +checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" [[package]] name = "byte-tools" @@ -279,9 +279,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" [[package]] name = "cfg-if" @@ -340,12 +340,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "const_fn" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -471,12 +465,11 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" dependencies = [ "cfg-if 1.0.0", - "const_fn", "crossbeam-utils", "lazy_static", "memoffset", @@ -485,9 +478,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" dependencies = [ "autocfg", "cfg-if 1.0.0", @@ -655,39 +648,16 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "fce" -version = "0.1.30" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9deb5e4f0e1533694ffbfd3644b8047ae41e8098165cdf5934a60b71f82e30c9" +checksum = "c75a27d84a4a5622cc3a30fcd02418cccce10e6964af80fe99564d3d8731ec19" dependencies = [ + "anyhow", "boolinator", "fce-utils", - "fce-wit-generator 0.1.30", + "fce-wit-generator", "fce-wit-interfaces", - "fce-wit-parser 0.1.29", - "log", - "multi-map", - "multimap", - "parity-wasm", - "pwasm-utils", - "safe-transmute", - "serde", - "wasmer-interface-types-fl", - "wasmer-runtime-core-fl", - "wasmer-runtime-fl", - "wasmer-wasi-fl", -] - -[[package]] -name = "fce" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e680149a26e9b74a140a143d624c1fe83f6a9d28daf8a12b2bdba261343a71" -dependencies = [ - "boolinator", - "fce-utils", - "fce-wit-generator 0.2.0", - "fce-wit-interfaces", - "fce-wit-parser 0.2.0", + "fce-wit-parser", "log", "multi-map", "multimap", @@ -695,6 +665,7 @@ dependencies = [ "pwasm-utils", "safe-transmute", "serde", + "thiserror", "wasmer-interface-types-fl", "wasmer-runtime-core-fl", "wasmer-runtime-fl", @@ -707,29 +678,14 @@ version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7a516882dccba04f0034e288c1aa5f06ce9da2711a7ce984ceebac8117e185e" -[[package]] -name = "fce-wit-generator" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e19c183d232092a59aeaa4f22212699b3da2acf0bcc5329a9de2a7bb7aa9f87" -dependencies = [ - "fce-wit-parser 0.1.29", - "fluence-sdk-wit", - "once_cell", - "serde", - "serde_json", - "walrus", - "wasmer-interface-types-fl", -] - [[package]] name = "fce-wit-generator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1eca715cf832f99fd59dae4f639e4437e5ac92a4470e0879624049f6cb1a3910" dependencies = [ - "fce-wit-parser 0.2.0", - "fluence-sdk-wit", + "fce-wit-parser", + "fluence-sdk-wit 0.2.18", "once_cell", "serde", "serde_json", @@ -747,20 +703,6 @@ dependencies = [ "wasmer-interface-types-fl", ] -[[package]] -name = "fce-wit-parser" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3c96db901280554168870de60ca609dea7bc7bdce9aae58d6c294faf812d43c" -dependencies = [ - "anyhow", - "fce-wit-interfaces", - "serde", - "walrus", - "wasmer-interface-types-fl", - "wasmer-runtime-core-fl", -] - [[package]] name = "fce-wit-parser" version = "0.2.0" @@ -787,17 +729,27 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d9a5e4292d7bbd809a0e968e3c3aacac91cbc5acab3e26ee1e1d726f0aab24" dependencies = [ - "fluence-sdk-macro", - "fluence-sdk-main", + "fluence-sdk-macro 0.2.18", + "fluence-sdk-main 0.2.18", +] + +[[package]] +name = "fluence" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31068fe4873478f9c59f01230dc6f23d504d8c11a36d6b6c51693b20c6d2570e" +dependencies = [ + "fluence-sdk-macro 0.4.2", + "fluence-sdk-main 0.4.2", ] [[package]] name = "fluence-app-service" -version = "0.1.30" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb49d32cad551606cc6ef324b93b0079e7f7f8a54be15176a314098028195cb" +checksum = "f64788737ce00700efe6a1e45f7462d3bdba6765891d76b81c806f250f8062f0" dependencies = [ - "fluence-faas 0.1.30", + "fluence-faas", "log", "maplit", "serde", @@ -809,37 +761,14 @@ dependencies = [ [[package]] name = "fluence-faas" -version = "0.1.30" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74511b8a8fc16e3cb3749631824b90f89cecb742cbbaf4e467a0873e34a5a53" +checksum = "00434a1581cfdb781b889f1c11e2b8b6ad160a717021e62054be2e9796c1d13d" dependencies = [ "cmd_lib", - "fce 0.1.30", + "fce", "fce-utils", - "fluence-sdk-main", - "itertools 0.9.0", - "log", - "safe-transmute", - "serde", - "serde_derive", - "serde_json", - "toml", - "wasmer-interface-types-fl", - "wasmer-runtime-core-fl", - "wasmer-runtime-fl", - "wasmer-wasi-fl", -] - -[[package]] -name = "fluence-faas" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0696945762ee0d5ed97537bdd0fa1c71957fc23794074ae035d428e90bedae5" -dependencies = [ - "cmd_lib", - "fce 0.2.0", - "fce-utils", - "fluence-sdk-main", + "fluence-sdk-main 0.4.2", "itertools 0.9.0", "log", "safe-transmute", @@ -872,7 +801,16 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea1a7c75a617f827d1ba9a17b4d84e1565ab239915c63f5a85c41f89a9f1d4ba" dependencies = [ - "fluence-sdk-wit", + "fluence-sdk-wit 0.2.18", +] + +[[package]] +name = "fluence-sdk-macro" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ce80dc2d7c3db828fb31b95e75c372fde7a9a25dfa2b0d9beac07379b890a6" +dependencies = [ + "fluence-sdk-wit 0.4.2", ] [[package]] @@ -881,7 +819,18 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6edcc983f9517c1b6bf9f851ef27f2894a3159aaa4a2fb6c9deb2ae8ecb603fa" dependencies = [ - "fluence-sdk-macro", + "fluence-sdk-macro 0.2.18", + "log", + "serde", +] + +[[package]] +name = "fluence-sdk-main" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29cce53288e08ed86ebe36c64d8eb641a95e1d0f7f75da969b29e16ab0d7d406" +dependencies = [ + "fluence-sdk-macro 0.4.2", "log", "serde", ] @@ -900,6 +849,20 @@ dependencies = [ "uuid", ] +[[package]] +name = "fluence-sdk-wit" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d835812bab8fb6f261b9e37355b9bf0a28a16123580145ce0fe44ef4363144" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn", + "uuid", +] + [[package]] name = "fstrings" version = "0.2.3" @@ -1082,7 +1045,7 @@ dependencies = [ "criterion", "csv", "env_logger", - "fluence", + "fluence 0.4.2", "fluence-app-service", "jsonpath_lib-fl", "log", @@ -1357,9 +1320,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.5.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +checksum = "10acf907b94fc1b1a152d08ef97e7759650268cf986bf127f387e602b02c7e5a" [[package]] name = "oorandom" @@ -1498,7 +1461,7 @@ dependencies = [ name = "polyplets" version = "0.1.0" dependencies = [ - "fluence", + "fluence 0.4.2", "serde", ] @@ -1877,18 +1840,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2", "quote", diff --git a/crates/interpreter-interface/Cargo.toml b/crates/interpreter-interface/Cargo.toml index 7b02b3be..214c8ddc 100644 --- a/crates/interpreter-interface/Cargo.toml +++ b/crates/interpreter-interface/Cargo.toml @@ -11,7 +11,7 @@ name = "aqua_interpreter_interface" path = "src/lib.rs" [dependencies] -fluence = "0.2.18" +fluence = { version = "0.4.2", features = ["logger"] } fluence-it-types = "0.1.0" serde = "=1.0.118" diff --git a/crates/polyplets/Cargo.toml b/crates/polyplets/Cargo.toml index bf469328..ea470edb 100644 --- a/crates/polyplets/Cargo.toml +++ b/crates/polyplets/Cargo.toml @@ -10,5 +10,5 @@ name = "polyplets" path = "src/lib.rs" [dependencies] -fluence = { version = "0.2.18", features = ["logger"] } +fluence = { version = "0.4.2", features = ["logger"] } serde = { version = "=1.0.118", features = ["rc"] } diff --git a/crates/test-module/Cargo.toml b/crates/test-module/Cargo.toml index 9de11fca..e97a8960 100644 --- a/crates/test-module/Cargo.toml +++ b/crates/test-module/Cargo.toml @@ -10,4 +10,4 @@ name = "aqua_test_module" path = "src/main.rs" [dependencies] -fluence = { version = "0.2.18", features = ["logger"] } +fluence = { version = "0.4.2", features = ["logger"] } diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index b2f1159f..6a360362 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -10,6 +10,6 @@ name = "aqua_test_utils" path = "src/lib.rs" [dependencies] -fluence = { version = "0.2.18", features = ["logger"] } -aquamarine-vm = { version = "0.3.1", features = ["raw-aquamarine-vm-api"] } +fluence = { version = "0.4.2", features = ["logger"] } +aquamarine-vm = { version = "0.5.1", features = ["raw-aquamarine-vm-api"] } serde_json = "1.0.56" diff --git a/interpreter-lib/Cargo.toml b/interpreter-lib/Cargo.toml index 5139c7de..f7cdce29 100644 --- a/interpreter-lib/Cargo.toml +++ b/interpreter-lib/Cargo.toml @@ -10,7 +10,7 @@ path = "src/lib.rs" [dependencies] air-parser = { path = "../crates/air-parser" } -fluence = { version = "0.2.18", features = ["logger"] } +fluence = { version = "0.4.2", features = ["logger"] } polyplets = { path = "../crates/polyplets" } aqua-interpreter-interface = { path = "../crates/interpreter-interface" } @@ -28,7 +28,7 @@ wasm-bindgen = "=0.2.65" [dev_dependencies] aqua-test-utils = { path = "../crates/test-utils" } -fluence-app-service = "0.1.29" +fluence-app-service = "0.5.1" criterion = "0.3.3" csv = "1.1.5" diff --git a/interpreter-lib/src/execution/air/call.rs b/interpreter-lib/src/execution/air/call.rs index a27b78ed..04401e22 100644 --- a/interpreter-lib/src/execution/air/call.rs +++ b/interpreter-lib/src/execution/air/call.rs @@ -80,7 +80,7 @@ fn set_last_error<'i>( macro_rules! log_join { ($($args:tt)*) => { - log::trace!(target: crate::log_targets::JOIN_BEHAVIOUR, $($args)*) + log::info!(target: crate::log_targets::JOIN_BEHAVIOUR, $($args)*) } } diff --git a/interpreter-lib/tests/security_tetraplets.rs b/interpreter-lib/tests/security_tetraplets.rs index 9481048a..2dd70f37 100644 --- a/interpreter-lib/tests/security_tetraplets.rs +++ b/interpreter-lib/tests/security_tetraplets.rs @@ -198,6 +198,7 @@ fn fold_json_path() { use fluence_app_service::AppService; use fluence_app_service::AppServiceConfig; use fluence_app_service::FaaSConfig; +use fluence_app_service::ModuleDescriptor; use interpreter_lib::execution_trace::CallResult; use interpreter_lib::execution_trace::ExecutedState; @@ -208,9 +209,15 @@ fn construct_service_config(module_name: impl Into) -> AppServiceConfig let module_name = module_name.into(); let module_path = format!("./tests/security_tetraplets/{}/target/wasm32-wasi/debug/", module_name); + let module_descriptor = ModuleDescriptor { + file_name: module_name.clone() + ".wasm", + import_name: module_name, + ..<_>::default() + }; + let faas_config = FaaSConfig { modules_dir: Some(PathBuf::from(module_path)), - modules_config: vec![(module_name, <_>::default())], + modules_config: vec![module_descriptor], default_modules_config: None, }; diff --git a/interpreter-lib/tests/security_tetraplets/auth_module/Cargo.toml b/interpreter-lib/tests/security_tetraplets/auth_module/Cargo.toml index e6e52dc7..68d56c50 100644 --- a/interpreter-lib/tests/security_tetraplets/auth_module/Cargo.toml +++ b/interpreter-lib/tests/security_tetraplets/auth_module/Cargo.toml @@ -10,6 +10,6 @@ path = "src/main.rs" [dependencies] interpreter-lib = { path = "../../../../interpreter-lib" } -fluence = { version = "0.2.18", features = ["logger"] } +fluence = { version = "0.4.2", features = ["logger"] } [workspace] diff --git a/interpreter-lib/tests/security_tetraplets/log_storage/Cargo.toml b/interpreter-lib/tests/security_tetraplets/log_storage/Cargo.toml index 1c7eed23..e57bf729 100644 --- a/interpreter-lib/tests/security_tetraplets/log_storage/Cargo.toml +++ b/interpreter-lib/tests/security_tetraplets/log_storage/Cargo.toml @@ -10,6 +10,6 @@ path = "src/main.rs" [dependencies] interpreter-lib = { path = "../../../../interpreter-lib" } -fluence = { version = "0.2.18", features = ["logger"] } +fluence = { version = "0.4.2", features = ["logger"] } [workspace] diff --git a/interpreter/Cargo.toml b/interpreter/Cargo.toml index 0eaaabd0..defe66cc 100644 --- a/interpreter/Cargo.toml +++ b/interpreter/Cargo.toml @@ -16,7 +16,7 @@ path = "src/fce.rs" [dependencies] interpreter-lib = { path = "../interpreter-lib" } -fluence = { version = "0.2.18", features = ["logger"] } +fluence = { version = "0.4.2", features = ["logger"] } # Keep 0.2.65 until this is resolved https://github.com/rustwasm/wasm-pack/issues/886 wasm-bindgen = "=0.2.65" diff --git a/interpreter/src/fce.rs b/interpreter/src/fce.rs index 47bfcbad..35704dbf 100644 --- a/interpreter/src/fce.rs +++ b/interpreter/src/fce.rs @@ -32,11 +32,6 @@ mod logger; use fluence::fce; use interpreter_lib::execute_aqua; use interpreter_lib::InterpreterOutcome; -use logger::DEFAULT_LOG_LEVEL; - -use log::Level as LogLevel; - -const WASM_LOG_ENV_NAME: &str = "WASM_LOG"; pub fn main() { logger::init_logger(); @@ -44,9 +39,6 @@ pub fn main() { #[fce] pub fn invoke(init_peer_id: String, aqua: String, prev_data: Vec, data: Vec) -> InterpreterOutcome { - let log_level = get_log_level(); - log::set_max_level(log_level.to_level_filter()); - execute_aqua(init_peer_id, aqua, prev_data, data) } @@ -54,12 +46,3 @@ pub fn invoke(init_peer_id: String, aqua: String, prev_data: Vec, data: Vec< pub fn ast(script: String) -> String { ast::ast(script) } - -fn get_log_level() -> LogLevel { - use std::str::FromStr; - - match std::env::var(WASM_LOG_ENV_NAME) { - Ok(log_level_str) => LogLevel::from_str(&log_level_str).unwrap_or(DEFAULT_LOG_LEVEL), - Err(_) => DEFAULT_LOG_LEVEL, - } -} diff --git a/interpreter/src/logger.rs b/interpreter/src/logger.rs index 1a7948ed..2216eb0c 100644 --- a/interpreter/src/logger.rs +++ b/interpreter/src/logger.rs @@ -16,14 +16,11 @@ use interpreter_lib::log_targets::TARGET_MAP; -use log::Level as LogLevel; - -pub const DEFAULT_LOG_LEVEL: LogLevel = LogLevel::Info; - pub fn init_logger() { let target_map = TARGET_MAP.iter().cloned().collect(); fluence::WasmLoggerBuilder::new() .with_target_map(target_map) + .filter("jsonpath_lib", log::LevelFilter::Info) .build() .unwrap(); } diff --git a/interpreter/src/wasm_bindgen.rs b/interpreter/src/wasm_bindgen.rs index 2bbfa74a..4e50a5a4 100644 --- a/interpreter/src/wasm_bindgen.rs +++ b/interpreter/src/wasm_bindgen.rs @@ -30,10 +30,12 @@ mod ast; mod logger; use interpreter_lib::execute_aqua; -use logger::DEFAULT_LOG_LEVEL; +use log::LevelFilter; use wasm_bindgen::prelude::*; +pub const DEFAULT_LOG_LEVEL: LevelFilter = LevelFilter::Trace; + #[wasm_bindgen(start)] pub fn main() { logger::init_logger(); @@ -43,8 +45,8 @@ pub fn main() { pub fn invoke(init_peer_id: String, aqua: String, prev_data: Vec, data: Vec, log_level: &str) -> String { use std::str::FromStr; - let log_level = log::Level::from_str(log_level).unwrap_or(DEFAULT_LOG_LEVEL); - log::set_max_level(log_level.to_level_filter()); + let log_level = log::LevelFilter::from_str(log_level).unwrap_or(DEFAULT_LOG_LEVEL); + log::set_max_level(log_level); let outcome = execute_aqua(init_peer_id, aqua, prev_data, data); serde_json::to_string(&outcome).expect("Cannot parse InterpreterOutcome")