Skip to content

Commit b780d8c

Browse files
committed
init default logger
1 parent 8850cbb commit b780d8c

File tree

5 files changed

+37
-24
lines changed

5 files changed

+37
-24
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ route-recognizer = "0.1.13"
4242
serde = "1.0.102"
4343
serde_json = "1.0.41"
4444
serde_qs = "0.5.0"
45-
femme = "1.3.0"
45+
femme = { path = "../../femme" }
4646

4747
[dev-dependencies]
4848
async-std = { version = "1.4.0", features = ["unstable", "attributes"] }

examples/hello.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
use async_std::task;
2-
3-
fn main() -> Result<(), std::io::Error> {
4-
task::block_on(async {
5-
let mut app = tide::new();
6-
app.at("/").get(|_| async move { Ok("Hello, world!") });
7-
app.listen("127.0.0.1:8080").await?;
8-
Ok(())
9-
})
1+
#[async_std::main]
2+
async fn main() -> Result<(), std::io::Error> {
3+
tide::log::start();
4+
let mut app = tide::new();
5+
app.at("/").get(|_| async move { Ok("Hello, world!") });
6+
app.listen("127.0.0.1:8080").await?;
7+
Ok(())
108
}

examples/static_file.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
use async_std::task;
2-
use tide::log;
3-
4-
fn main() -> Result<(), std::io::Error> {
5-
femme::start(log::Level::Info.to_level_filter()).unwrap();
6-
task::block_on(async {
7-
let mut app = tide::new();
8-
app.at("/").get(|_| async move { Ok("visit /src/*") });
9-
app.at("/src").serve_dir("src/")?;
10-
app.listen("127.0.0.1:8080").await?;
11-
Ok(())
12-
})
1+
#[async_std::main]
2+
async fn main() -> Result<(), std::io::Error> {
3+
tide::log::start();
4+
let mut app = tide::new();
5+
app.at("/").get(|_| async move { Ok("visit /src/*") });
6+
app.at("/src").serve_dir("src/")?;
7+
app.listen("127.0.0.1:8080").await?;
8+
Ok(())
139
}

src/log/mod.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,17 @@ pub use kv_log_macro::{max_level, Level};
2323

2424
mod middleware;
2525

26+
pub use femme::LevelFilter;
2627
pub use middleware::LogMiddleware;
28+
29+
/// Start logging.
30+
pub fn start() {
31+
femme::start();
32+
crate::log::info!("Logger started", { level: "Info" });
33+
}
34+
35+
/// Start logging with a log level.
36+
pub fn with_level(level: LevelFilter) {
37+
femme::with_level(level);
38+
crate::log::info!("Logger started", { level: format!("{}", level) });
39+
}

src/server.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,15 @@ impl<State: Send + Sync + 'static> Server<State> {
283283
let listener = async_std::net::TcpListener::bind(addr).await?;
284284

285285
let addr = format!("http://{}", listener.local_addr()?);
286-
log::info!("Server is listening on: {}", addr);
287-
let mut incoming = listener.incoming();
286+
let tls = false;
287+
let target = if cfg!(debug_assertions) {
288+
"dev"
289+
} else {
290+
"release"
291+
};
292+
log::info!("Server listening", { address: addr, target: target, tls: tls });
288293

294+
let mut incoming = listener.incoming();
289295
while let Some(stream) = incoming.next().await {
290296
let stream = stream?;
291297
let addr = addr.clone();

0 commit comments

Comments
 (0)