Skip to content

Commit

Permalink
Put the first field on a new line, too
Browse files Browse the repository at this point in the history
  • Loading branch information
@oli-obk
oli-obk committed May 23, 2023
1 parent bd7a397 commit 5546d81
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 64 deletions.
72 changes: 48 additions & 24 deletions examples/basic.stdout
View file
Original file line number Diff line number Diff line change
@@ -1,68 +1,92 @@
1:main┐basic::hierarchical-example version=0.1
1:main├┐basic::hierarchical-example version=0.1
1:main│└┬─┬─ basic::server host="localhost"
1:main┐basic::hierarchical-example
1:main┐ version=0.1
1:main├┬─┬─ basic::hierarchical-example
1:main││ └─ version=0.1
1:main│└┬─┬─ basic::server
1:main│ │ ├─ host="localhost"
1:main│ │ └─ port=8080
1:main│ ├─ Xms INFO basic starting
1:main│ ├─ Xs INFO basic listening
1:main│ ├┬─┬─ basic::server host="localhost"
1:main│ ├┬─┬─ basic::server
1:main│ ││ ├─ host="localhost"
1:main│ ││ └─ port=8080
1:main│ │└┬─┬─ basic::conn peer_addr="82.9.9.9"
1:main│ │└┬─┬─ basic::conn
1:main│ │ │ ├─ peer_addr="82.9.9.9"
1:main│ │ │ └─ port=42381
1:main│ │ ├─ Xms DEBUG basic connected
1:main│ │ ├─┬─ Xms DEBUG basic message received
1:main│ │ │ └─ length=2
1:main│ │┌┴┬─ basic::conn peer_addr="82.9.9.9"
1:main│ │┌┴┬─ basic::conn
1:main│ ││ ├─ peer_addr="82.9.9.9"
1:main│ ││ └─ port=42381
1:main│ ├┴┬─ basic::server host="localhost"
1:main│ ├┴┬─ basic::server
1:main│ │ ├─ host="localhost"
1:main│ │ └─ port=8080
1:main│ ├┬─┬─ basic::server host="localhost"
1:main│ ├┬─┬─ basic::server
1:main│ ││ ├─ host="localhost"
1:main│ ││ └─ port=8080
1:main│ │└┬─┬─ basic::conn peer_addr="8.8.8.8"
1:main│ │└┬─┬─ basic::conn
1:main│ │ │ ├─ peer_addr="8.8.8.8"
1:main│ │ │ └─ port=18230
1:main│ │ ├─ Xms DEBUG basic connected
1:main│ │┌┴┬─ basic::conn peer_addr="8.8.8.8"
1:main│ │┌┴┬─ basic::conn
1:main│ ││ ├─ peer_addr="8.8.8.8"
1:main│ ││ └─ port=18230
1:main│ ├┴┬─ basic::server host="localhost"
1:main│ ├┴┬─ basic::server
1:main│ │ ├─ host="localhost"
1:main│ │ └─ port=8080
1:main│ ├┬─┬─ basic::server host="localhost"
1:main│ ├┬─┬─ basic::server
1:main│ ││ ├─ host="localhost"
1:main│ ││ └─ port=8080
1:main│ │└┬─┬─ basic::foomp 42 <- format string
1:main│ │ │ └─ normal_var=43
1:main│ │ ├─ Xms ERROR basic hello
1:main│ │┌┴┬─ basic::foomp 42 <- format string
1:main│ ││ └─ normal_var=43
1:main│ ├┴┬─ basic::server host="localhost"
1:main│ ├┴┬─ basic::server
1:main│ │ ├─ host="localhost"
1:main│ │ └─ port=8080
1:main│ ├┬─┬─ basic::server host="localhost"
1:main│ ├┬─┬─ basic::server
1:main│ ││ ├─ host="localhost"
1:main│ ││ └─ port=8080
1:main│ │└┬─┬─ basic::conn peer_addr="82.9.9.9"
1:main│ │└┬─┬─ basic::conn
1:main│ │ │ ├─ peer_addr="82.9.9.9"
1:main│ │ │ └─ port=42381
1:main│ │ ├─┬─ Xms WARN basic weak encryption requested
1:main│ │ │ └─ algo="xor"
1:main│ │ ├─┬─ Xms DEBUG basic response sent
1:main│ │ │ └─ length=8
1:main│ │ ├─ Xms DEBUG basic disconnected
1:main│ │┌┴┬─ basic::conn peer_addr="82.9.9.9"
1:main│ │┌┴┬─ basic::conn
1:main│ ││ ├─ peer_addr="82.9.9.9"
1:main│ ││ └─ port=42381
1:main│ ├┴┬─ basic::server host="localhost"
1:main│ ├┴┬─ basic::server
1:main│ │ ├─ host="localhost"
1:main│ │ └─ port=8080
1:main│ ├┬─┬─ basic::server host="localhost"
1:main│ ├┬─┬─ basic::server
1:main│ ││ ├─ host="localhost"
1:main│ ││ └─ port=8080
1:main│ │└┬─┬─ basic::conn peer_addr="8.8.8.8"
1:main│ │└┬─┬─ basic::conn
1:main│ │ │ ├─ peer_addr="8.8.8.8"
1:main│ │ │ └─ port=18230
1:main│ │ ├─┬─ Xms DEBUG basic message received
1:main│ │ │ └─ length=5
1:main│ │ ├─┬─ Xms DEBUG basic response sent
1:main│ │ │ └─ length=8
1:main│ │ ├─ Xms DEBUG basic disconnected
1:main│ │┌┴┬─ basic::conn peer_addr="8.8.8.8"
1:main│ │┌┴┬─ basic::conn
1:main│ ││ ├─ peer_addr="8.8.8.8"
1:main│ ││ └─ port=18230
1:main│ ├┴┬─ basic::server host="localhost"
1:main│ ├┴┬─ basic::server
1:main│ │ ├─ host="localhost"
1:main│ │ └─ port=8080
1:main│ ├─ Xs WARN basic internal error
1:main│ ├─ Xs ERROR basic this is a log message
1:main│ ├─ Xs INFO basic exit
1:main│┌┴┬─ basic::server host="localhost"
1:main│┌┴┬─ basic::server
1:main││ ├─ host="localhost"
1:main││ └─ port=8080
1:main├┘basic::hierarchical-example version=0.1
1:main┘basic::hierarchical-example version=0.1
1:main├┴┬─ basic::hierarchical-example
1:main│ └─ version=0.1
1:main┘basic::hierarchical-example
1:main┘ version=0.1
18 changes: 12 additions & 6 deletions examples/quiet.stdout
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,37 @@
1:main┐quiet::hierarchical-example version=0.1
1:main├─┬─┬─ quiet::server host="localhost"
1:main┐quiet::hierarchical-example
1:main┐ version=0.1
1:main├─┬─┬─ quiet::server
1:main│ │ ├─ host="localhost"
1:main│ │ └─ port=8080
1:main│ ├─ Xms INFO quiet starting
1:main│ ├─ Xms INFO quiet listening
1:main│ ├─┬─┬─ quiet::conn peer_addr="82.9.9.9"
1:main│ ├─┬─┬─ quiet::conn
1:main│ │ │ ├─ peer_addr="82.9.9.9"
1:main│ │ │ └─ port=42381
1:main│ │ ├─ Xms DEBUG quiet connected
1:main│ │ ├─┬─ Xms DEBUG quiet message received
1:main│ │ │ └─ length=2
1:main│ ├─┘
1:main│ ├─┬─┬─ quiet::conn peer_addr="8.8.8.8"
1:main│ ├─┬─┬─ quiet::conn
1:main│ │ │ ├─ peer_addr="8.8.8.8"
1:main│ │ │ └─ port=18230
1:main│ │ ├─ Xms DEBUG quiet connected
1:main│ ├─┘
1:main│ ├─┬─┬─ quiet::foomp 42 <- format string
1:main│ │ │ └─ normal_var=43
1:main│ │ ├─ Xms ERROR quiet hello
1:main│ ├─┘
1:main│ ├─┬─┬─ quiet::conn peer_addr="82.9.9.9"
1:main│ ├─┬─┬─ quiet::conn
1:main│ │ │ ├─ peer_addr="82.9.9.9"
1:main│ │ │ └─ port=42381
1:main│ │ ├─┬─ Xms WARN quiet weak encryption requested
1:main│ │ │ └─ algo="xor"
1:main│ │ ├─┬─ Xms DEBUG quiet response sent
1:main│ │ │ └─ length=8
1:main│ │ ├─ Xms DEBUG quiet disconnected
1:main│ ├─┘
1:main│ ├─┬─┬─ quiet::conn peer_addr="8.8.8.8"
1:main│ ├─┬─┬─ quiet::conn
1:main│ │ │ ├─ peer_addr="8.8.8.8"
1:main│ │ │ └─ port=18230
1:main│ │ ├─┬─ Xms DEBUG quiet message received
1:main│ │ │ └─ length=5
Expand Down
66 changes: 44 additions & 22 deletions examples/wraparound.stdout
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,72 @@
1:main┐wraparound::recurse i=0
1:main┐wraparound::recurse
1:main┐ i=0
1:main├─ Xms WARN wraparound boop
1:main├─┐wraparound::recurse i=1
1:main├─┬─┬─ wraparound::recurse
1:main│ │ └─ i=1
1:main│ ├─ Xms WARN wraparound boop
1:main│ ├─┐wraparound::recurse i=2
1:main│ ├─┬─┬─ wraparound::recurse
1:main│ │ │ └─ i=2
1:main│ │ ├─ Xms WARN wraparound boop
1:main│ │ ├─┐wraparound::recurse i=3
1:main│ │ ├─┬─┬─ wraparound::recurse
1:main│ │ │ │ └─ i=3
1:main│ │ │ ├─ Xms WARN wraparound boop
1:main│ │ │ ├─┐wraparound::recurse i=4
1:main│ │ │ ├─┬─┬─ wraparound::recurse
1:main│ │ │ │ │ └─ i=4
1:main────────┘
1:main Xms WARN wraparound boop
1:main┐wraparound::recurse i=5
1:main┐wraparound::recurse
1:main┐ i=5
1:main├─ Xms WARN wraparound boop
1:main├─┐wraparound::recurse i=6
1:main├─┬─┬─ wraparound::recurse
1:main│ │ └─ i=6
1:main│ ├─ Xms WARN wraparound boop
1:main│ ├─┐wraparound::recurse i=7
1:main│ ├─┬─┬─ wraparound::recurse
1:main│ │ │ └─ i=7
1:main│ │ ├─ Xms WARN wraparound boop
1:main│ │ ├─┐wraparound::recurse i=8
1:main│ │ ├─┬─┬─ wraparound::recurse
1:main│ │ │ │ └─ i=8
1:main│ │ │ ├─ Xms WARN wraparound boop
1:main│ │ │ ├─┐wraparound::recurse i=9
1:main│ │ │ ├─┬─┬─ wraparound::recurse
1:main│ │ │ │ │ └─ i=9
1:main────────┘
1:main Xms WARN wraparound boop
1:main┐wraparound::recurse i=10
1:main┐wraparound::recurse
1:main┐ i=10
1:main├─ Xms WARN wraparound boop
1:main├─┐wraparound::recurse i=11
1:main├─┬─┬─ wraparound::recurse
1:main│ │ └─ i=11
1:main│ ├─ Xms WARN wraparound boop
1:main│ ├─┐wraparound::recurse i=12
1:main│ ├─┬─┬─ wraparound::recurse
1:main│ │ │ └─ i=12
1:main│ │ ├─ Xms WARN wraparound boop
1:main│ │ ├─┐wraparound::recurse i=13
1:main│ │ ├─┬─┬─ wraparound::recurse
1:main│ │ │ │ └─ i=13
1:main│ │ │ ├─ Xms WARN wraparound boop
1:main│ │ │ ├─┐wraparound::recurse i=14
1:main│ │ │ ├─┬─┬─ wraparound::recurse
1:main│ │ │ │ │ └─ i=14
1:main────────┘
1:main Xms WARN wraparound boop
1:main┐wraparound::recurse i=15
1:main┐wraparound::recurse
1:main┐ i=15
1:main├─ Xms WARN wraparound boop
1:main├─┐wraparound::recurse i=16
1:main├─┬─┬─ wraparound::recurse
1:main│ │ └─ i=16
1:main│ ├─ Xms WARN wraparound boop
1:main│ ├─┐wraparound::recurse i=17
1:main│ ├─┬─┬─ wraparound::recurse
1:main│ │ │ └─ i=17
1:main│ │ ├─ Xms WARN wraparound boop
1:main│ │ ├─┐wraparound::recurse i=18
1:main│ │ ├─┬─┬─ wraparound::recurse
1:main│ │ │ │ └─ i=18
1:main│ │ │ ├─ Xms WARN wraparound boop
1:main│ │ │ ├─┐wraparound::recurse i=19
1:main│ │ │ ├─┬─┬─ wraparound::recurse
1:main│ │ │ │ │ └─ i=19
1:main────────┘
1:main Xms WARN wraparound boop
1:main┐wraparound::recurse i=20
1:main┐wraparound::recurse
1:main┐ i=20
1:main├─ Xms WARN wraparound boop
1:main├─┐wraparound::recurse i=21
1:main├─┬─┬─ wraparound::recurse
1:main│ │ └─ i=21
1:main│ ├─ Xms WARN wraparound boop
1:main│ ├─ Xms WARN wraparound bop
1:main├─┘
Expand Down
8 changes: 2 additions & 6 deletions src/format.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,24 +222,20 @@ impl Buffers {

pub struct FmtEvent<'a> {
pub bufs: &'a mut Buffers,
pub comma: bool,
}

impl<'a> Visit for FmtEvent<'a> {
fn record_debug(&mut self, field: &Field, value: &dyn fmt::Debug) {
let buf = &mut self.bufs.current_buf;
let comma = if self.comma { "\n" } else { "" };
match field.name() {
"message" => {
write!(buf, "{} {:?}", comma, value).unwrap();
self.comma = true;
write!(buf, " {:?}", value).unwrap();
}
// Skip fields that are actually log metadata that have already been handled
#[cfg(feature = "tracing-log")]
name if name.starts_with("log.") => {}
name => {
write!(buf, "{} {}={:?}", comma, name, value).unwrap();
self.comma = true;
write!(buf, "\n {}={:?}", name, value).unwrap();
}
}
}
Expand Down
15 changes: 9 additions & 6 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,15 +212,20 @@ where
V: fmt::Display + 'a,
{
let mut kvs = kvs.into_iter();
let nl = if self.config.bracketed_fields {
""
} else {
"\n "
};
if let Some((k, v)) = kvs.next() {
if k == "message" {
write!(buf, "{}", v)?;
write!(buf, " {}", v)?;
} else {
write!(buf, "{}={}", k, v)?;
write!(buf, "{nl}{}={}", k, v)?;
}
}
for (k, v) in kvs {
write!(buf, "\n {}={}", k, v)?;
write!(buf, "{nl}{}={}", k, v)?;
}
Ok(())
}
Expand Down Expand Up @@ -272,8 +277,6 @@ where
self.styled(Style::new().fg(Color::Green).bold(), "{") // Style::new().fg(Color::Green).dimmed().paint("{")
)
.unwrap();
} else {
write!(current_buf, " ").unwrap();
}
self.print_kvs(&mut current_buf, data.kvs.iter().map(|(k, v)| (*k, v)))
.unwrap();
Expand Down Expand Up @@ -409,7 +412,7 @@ where
.expect("Unable to write to buffer");
}

let mut visitor = FmtEvent { comma: false, bufs };
let mut visitor = FmtEvent { bufs };
event.record(&mut visitor);
visitor
.bufs
Expand Down

0 comments on commit 5546d81

Please sign in to comment.