Skip to content

Revert "upgrade log, remove kv-log-macro" #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2019
Merged

Revert "upgrade log, remove kv-log-macro" #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ default = [
"crossbeam-channel",
"crossbeam-deque",
"futures-timer",
"kv-log-macro",
"log",
"mio",
"mio-uds",
Expand Down Expand Up @@ -57,7 +58,8 @@ crossbeam-utils = { version = "0.7.0", optional = true }
futures-core = { version = "0.3.1", optional = true }
futures-io = { version = "0.3.1", optional = true }
futures-timer = { version = "2.0.2", optional = true }
log = { version = "0.4.10", features = ["kv_unstable"], optional = true }
kv-log-macro = { version = "1.0.4", optional = true }
log = { version = "0.4.8", features = ["kv_unstable"], optional = true }
memchr = { version = "2.2.1", optional = true }
mio = { version = "0.6.19", optional = true }
mio-uds = { version = "0.6.7", optional = true }
Expand Down
5 changes: 3 additions & 2 deletions src/task/block_on.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use std::task::{RawWaker, RawWakerVTable};
use std::thread;

use crossbeam_utils::sync::Parker;
use kv_log_macro::trace;
use log::log_enabled;

use crate::task::{Context, Poll, Task, Waker};
Expand Down Expand Up @@ -42,7 +43,7 @@ where

// Log this `block_on` operation.
if log_enabled!(log::Level::Trace) {
log::trace!("block_on", {
trace!("block_on", {
task_id: task.id().0,
parent_task_id: Task::get_current(|t| t.id().0).unwrap_or(0),
});
Expand All @@ -58,7 +59,7 @@ where
defer! {
if log_enabled!(log::Level::Trace) {
Task::get_current(|t| {
log::trace!("completed", {
trace!("completed", {
task_id: t.id().0,
});
});
Expand Down
5 changes: 3 additions & 2 deletions src/task/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use kv_log_macro::trace;
use log::log_enabled;
use std::future::Future;

Expand Down Expand Up @@ -37,7 +38,7 @@ impl Builder {

// Log this `spawn` operation.
if log_enabled!(log::Level::Trace) {
log::trace!("spawn", {
trace!("spawn", {
task_id: task.id().0,
parent_task_id: Task::get_current(|t| t.id().0).unwrap_or(0),
});
Expand All @@ -53,7 +54,7 @@ impl Builder {
defer! {
if log_enabled!(log::Level::Trace) {
Task::get_current(|t| {
log::trace!("completed", {
trace!("completed", {
task_id: t.id().0,
});
});
Expand Down