diff --git a/Cargo.lock b/Cargo.lock index 07ab4299..11780170 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,6 +15,15 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +[[package]] +name = "aho-corasick" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +dependencies = [ + "memchr", +] + [[package]] name = "ansi_term" version = "0.11.0" @@ -310,6 +319,19 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "erased-serde" version = "0.3.12" @@ -412,7 +434,7 @@ dependencies = [ [[package]] name = "fluence" version = "0.2.0" -source = "git+https://github.com/fluencelabs/rust-sdk#40774a1107573fc85f49fef6267721fbe32f599a" +source = "git+https://github.com/fluencelabs/rust-sdk#be47b96ce8e067296c37680c4083130c2ce9c859" dependencies = [ "fluence-sdk-macro", "fluence-sdk-main", @@ -437,7 +459,7 @@ dependencies = [ [[package]] name = "fluence-sdk-macro" version = "0.2.0" -source = "git+https://github.com/fluencelabs/rust-sdk#40774a1107573fc85f49fef6267721fbe32f599a" +source = "git+https://github.com/fluencelabs/rust-sdk#be47b96ce8e067296c37680c4083130c2ce9c859" dependencies = [ "fluence-sdk-wit", ] @@ -445,7 +467,7 @@ dependencies = [ [[package]] name = "fluence-sdk-main" version = "0.2.0" -source = "git+https://github.com/fluencelabs/rust-sdk#40774a1107573fc85f49fef6267721fbe32f599a" +source = "git+https://github.com/fluencelabs/rust-sdk#be47b96ce8e067296c37680c4083130c2ce9c859" dependencies = [ "log", ] @@ -453,7 +475,7 @@ dependencies = [ [[package]] name = "fluence-sdk-wit" version = "0.2.0" -source = "git+https://github.com/fluencelabs/rust-sdk#40774a1107573fc85f49fef6267721fbe32f599a" +source = "git+https://github.com/fluencelabs/rust-sdk#be47b96ce8e067296c37680c4083130c2ce9c859" dependencies = [ "proc-macro2", "quote", @@ -568,6 +590,15 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + [[package]] name = "id-arena" version = "2.2.1" @@ -611,7 +642,9 @@ name = "ipfs_node" version = "0.1.0" dependencies = [ "anyhow", + "env_logger", "fluence-faas", + "log", ] [[package]] @@ -662,9 +695,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ "cfg-if", ] @@ -830,6 +863,12 @@ dependencies = [ "parity-wasm", ] +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + [[package]] name = "quote" version = "1.0.7" @@ -922,6 +961,24 @@ version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +[[package]] +name = "regex" +version = "1.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", +] + +[[package]] +name = "regex-syntax" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" + [[package]] name = "rustc-demangle" version = "0.1.16" @@ -1067,6 +1124,15 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d" +[[package]] +name = "termcolor" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +dependencies = [ + "winapi-util", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -1096,6 +1162,15 @@ dependencies = [ "syn", ] +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ + "lazy_static", +] + [[package]] name = "time" version = "0.1.43" @@ -1414,6 +1489,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/engine/src/module/fce_module.rs b/engine/src/module/fce_module.rs index 4a97b03b..1ce79d3a 100644 --- a/engine/src/module/fce_module.rs +++ b/engine/src/module/fce_module.rs @@ -257,7 +257,7 @@ impl FCEModule { move |_: &mut Ctx, inputs: &[WValue]| -> Vec { use super::type_converters::wval_to_ival; - log::info!( + log::trace!( "raw import for {}.{} called with {:?}\n", import_namespace, import_name, @@ -275,7 +275,7 @@ impl FCEModule { ); } - log::info!( + log::trace!( "\nraw import for {}.{} finished", import_namespace, import_name diff --git a/examples/ipfs_node/Cargo.toml b/examples/ipfs_node/Cargo.toml index 980b9c15..6dc25eb0 100644 --- a/examples/ipfs_node/Cargo.toml +++ b/examples/ipfs_node/Cargo.toml @@ -7,3 +7,5 @@ edition = "2018" [dependencies] fluence-faas = { path = "../../fluence-faas" } anyhow = "1.0.31" +log = "0.4.11" +env_logger = "0.7.1" diff --git a/examples/ipfs_node/src/main.rs b/examples/ipfs_node/src/main.rs index 6896509c..0e28745e 100644 --- a/examples/ipfs_node/src/main.rs +++ b/examples/ipfs_node/src/main.rs @@ -24,6 +24,7 @@ const IPFS_MODULES_CONFIG_PATH: &str = "Config.toml"; const IPFS_RPC: &str = "wasm/artifacts/ipfs_rpc.wasm"; fn main() -> Result<(), anyhow::Error> { + env_logger::init(); let ipfs_rpc = std::fs::read(IPFS_RPC).with_context(|| format!("{} wasn't found", IPFS_RPC))?; let mut ipfs_node = FluenceFaaS::new(PathBuf::from(IPFS_MODULES_CONFIG_PATH))?; diff --git a/examples/ipfs_node/wasm/artifacts/ipfs_rpc.wasm b/examples/ipfs_node/wasm/artifacts/ipfs_rpc.wasm index cb61b06e..18e57ba3 100755 Binary files a/examples/ipfs_node/wasm/artifacts/ipfs_rpc.wasm and b/examples/ipfs_node/wasm/artifacts/ipfs_rpc.wasm differ diff --git a/examples/ipfs_node/wasm/artifacts/wasm_modules/ipfs_node.wasm b/examples/ipfs_node/wasm/artifacts/wasm_modules/ipfs_node.wasm index 643af444..63ee598e 100644 Binary files a/examples/ipfs_node/wasm/artifacts/wasm_modules/ipfs_node.wasm and b/examples/ipfs_node/wasm/artifacts/wasm_modules/ipfs_node.wasm differ diff --git a/examples/ipfs_node/wasm/ipfs_node/Cargo.toml b/examples/ipfs_node/wasm/ipfs_node/Cargo.toml index db7b8d07..e26e3d51 100644 --- a/examples/ipfs_node/wasm/ipfs_node/Cargo.toml +++ b/examples/ipfs_node/wasm/ipfs_node/Cargo.toml @@ -10,4 +10,4 @@ path = "src/main.rs" [dependencies] fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } -log = "0.4.8" +log = "0.4.11" diff --git a/examples/ipfs_node/wasm/ipfs_rpc/Cargo.toml b/examples/ipfs_node/wasm/ipfs_rpc/Cargo.toml index 0700dc1e..526dd35a 100644 --- a/examples/ipfs_node/wasm/ipfs_rpc/Cargo.toml +++ b/examples/ipfs_node/wasm/ipfs_rpc/Cargo.toml @@ -10,4 +10,4 @@ path = "src/main.rs" [dependencies] fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } -log = "0.4.8" +log = "0.4.11"