fluencelabs/marine-rs-sdk
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine-rs-sdk synced 2025-03-15 14:30:48 +00:00
Code Issues Projects Releases Wiki Activity

reexport WASM_LOG_ENV_NAME

Browse Source
This commit is contained in:
vms 2020-12-09 11:34:39 +03:00
parent c90b685238
commit b631dab17f
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "fluence" name = "fluence"
version = "0.2.9" # remember to update html_root_url version = "0.2.10" # remember to update html_root_url
description = "Fluence backend SDK for developing backend applications for the Fluence network" description = "Fluence backend SDK for developing backend applications for the Fluence network"
documentation = "https://docs.rs/fluence/" documentation = "https://docs.rs/fluence/"
repository = "https://github.com/fluencelabs/rust-sdk" repository = "https://github.com/fluencelabs/rust-sdk"

2
crates/main/src/lib.rs
View File

@ -48,6 +48,8 @@ pub use export_allocator::deallocate;
pub use logger::WasmLoggerBuilder; pub use logger::WasmLoggerBuilder;
#[cfg(feature = "logger")] #[cfg(feature = "logger")]
pub use logger::TargetMap; pub use logger::TargetMap;
#[cfg(feature = "logger")]
pub use logger::WASM_LOG_ENV_NAME;
pub use result::get_result_ptr; pub use result::get_result_ptr;
pub use result::get_result_size; pub use result::get_result_size;

19
crates/main/src/logger.rs
View File

@ -44,6 +44,12 @@
use log::Level as LogLevel; use log::Level as LogLevel;
/// By default, logger will be initialized with log level from this environment variable.
pub const WASM_LOG_ENV_NAME: &'static str = "WASM_LOG";
/// If WASM_LOG_ENV isn't set, then this level will be used as the default.
const WASM_DEFAULT_LOG_LEVEL: LogLevel = LogLevel::Info;
pub type TargetMap = std::collections::HashMap<&'static str, i64>; pub type TargetMap = std::collections::HashMap<&'static str, i64>;
/// The Wasm Logger. /// The Wasm Logger.
@ -75,15 +81,10 @@ impl WasmLoggerBuilder {
pub fn new() -> Self { pub fn new() -> Self {
use std::str::FromStr; use std::str::FromStr;
const WASM_LOG_ENV_NAME: &'static str = "WASM_LOG"; let log_level = std::env::var(WASM_LOG_ENV_NAME)
const RUST_DEFAULT_LOG_LEVEL: LogLevel = LogLevel::Info; .map_or(WASM_DEFAULT_LOG_LEVEL, |log_level_str| {
LogLevel::from_str(&log_level_str).unwrap_or(WASM_DEFAULT_LOG_LEVEL)
let log_level = match std::env::var(WASM_LOG_ENV_NAME) { });
Ok(log_level_str) => {
LogLevel::from_str(&log_level_str).unwrap_or(RUST_DEFAULT_LOG_LEVEL)
}
Err(_) => RUST_DEFAULT_LOG_LEVEL,
};
Self { Self {
log_level, log_level,

2
src/lib.rs
View File

@ -55,7 +55,7 @@
//! pub fn curl_get(url: String) -> String; //! pub fn curl_get(url: String) -> String;
//! } //! }
//! ``` //! ```
#![doc(html_root_url = "https://docs.rs/fluence/0.2.9")] #![doc(html_root_url = "https://docs.rs/fluence/0.2.10")]
#![deny( #![deny(
dead_code, dead_code,
nonstandard_style, nonstandard_style,