build: always include env_logger, resolve #65

KonradHoeffner · Apr 9, 2024 · bca3b2c · bca3b2c
1 parent 98f9f50
commit bca3b2c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ tinytemplate = "1"
 serde = { version = "1", features = ["derive"] }
 config = { version = "0.14", default-features = false, features = ["toml"] }
 log = "0.4"
-env_logger = { version = "0.11", default-features = false, features = ["auto-color"], optional = true }
+env_logger = { version = "0.11", default-features = false, features = ["auto-color"] }
 hdt = { version = "0.1", optional = true }
 deepsize = { version = "0.2", default-features = false, features = ["std"] }
 bytesize = "1"
@@ -29,9 +29,8 @@ lazy_static = "1"
 serde_json = "1"
 
 [features]
-default = ["rdfxml", "log", "hdt"]
+default = ["rdfxml", "hdt"]
 rdfxml = ["sophia/xml"]
-log = ["env_logger"]
 hdt = ["dep:hdt"]
 
 [profile.release]

diff --git a/src/config.rs b/src/config.rs
@@ -80,13 +80,10 @@ impl Config {
         if config.base.ends_with('/') {
             config.base.pop();
         }
-        #[cfg(feature = "log")]
-        {
-            if std::env::var("RUST_LOG").is_err() {
-                std::env::set_var("RUST_LOG", format!("rickview={}", config.log_level.as_ref().unwrap_or(&"info".to_owned())));
-            }
-            env_logger::builder().format_timestamp(None).format_target(false).init();
+        if std::env::var("RUST_LOG").is_err() {
+            std::env::set_var("RUST_LOG", format!("rickview={}", config.log_level.as_ref().unwrap_or(&"info".to_owned())));
         }
+        env_logger::builder().format_timestamp(None).format_target(false).init();
 
         // path relative to executable
         match std::fs::File::open("data/body.html") {