feat: switch to structured logging only
Replace all use of log and env-logger crates with structured logging using slog and slog-json.
Change the recently introduced logger module to use the slog-scope crate. This avoids having to pass a reference to logger::Logging to every place that needs to do any logging.
Signed-off-by: Lars Wirzenius liw@liw.fi
13 files changed
+310
-293
f0a99590
→
85414e86
modified Cargo.lock
@@ -179,6 +179,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -501,6 +507,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -703,16 +719,6 @@ dependencies = [
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -726,19 +732,6 @@ dependencies = [
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -1729,10 +1722,9 @@ version = "0.4.0"
|
|
|
|
|
|
| + | |
|
|
| - | |
|
|
| - | |
|
|
|
|
|
@@ -1742,6 +1734,7 @@ dependencies = [
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2215,6 +2208,17 @@ dependencies = [
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2371,7 +2375,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified Cargo.toml
@@ -13,9 +13,7 @@ categories = ["development-tools::build-utils"]
|
|
|
|
|
|
| - | |
|
|
| - | |
|
|
|
|
|
@@ -24,6 +22,7 @@ serde_json = "1.0.121"
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -36,6 +35,7 @@ version = "0.12.0"
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified src/adapter.rs
@@ -15,10 +15,9 @@ use std::{
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
| + | |
|
|
|
|
|
@@ -52,8 +51,6 @@ impl Adapter {
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -69,7 +66,6 @@ impl Adapter {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -81,7 +77,6 @@ impl Adapter {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -98,7 +93,6 @@ impl Adapter {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -111,13 +105,12 @@ impl Adapter {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -126,22 +119,18 @@ impl Adapter {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
|
|
|
|
|
|
| - | |
|
|
| - | |
|
|
|
|
|
@@ -149,11 +138,11 @@ impl Adapter {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -233,7 +222,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -257,8 +246,6 @@ mod test {
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -279,8 +266,6 @@ echo '{"response":"finished","result":"success"}'
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -306,8 +291,6 @@ echo '{"response":"finished","result":"failure"}'
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -332,8 +315,6 @@ exit 1
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -356,8 +337,6 @@ kill -9 $BASHPID
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -379,8 +358,6 @@ kill -9 $BASHPID
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -403,8 +380,6 @@ kill -9 $BASHPID
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -429,8 +404,6 @@ echo '{"response":"finished","result":"success","bad":"field"}'
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -456,8 +429,6 @@ echo '{"response":"finished","result":"success"}'
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -485,8 +456,6 @@ echo '{"response":"finished","result":"success"}'
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -507,8 +476,6 @@ echo '{"response":"finished","result":"success"}'
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -536,8 +503,6 @@ echo '{"response":"finished","result":"success"}'
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
modified src/bin/cib.rs
@@ -3,14 +3,12 @@
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -19,7 +17,7 @@ use radicle_ci_broker::{
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -27,31 +25,22 @@ use radicle_ci_broker::{
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -131,7 +120,6 @@ impl InsertCmd {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -153,7 +141,7 @@ impl QueuedCmd {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -174,7 +162,6 @@ impl QueuedCmd {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -221,7 +208,7 @@ impl ProcessEventsCmd {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -236,18 +223,14 @@ impl ProcessEventsCmd {
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
|
|
| - | |
|
|
|
|
|
modified src/bin/cibtool.rs
@@ -54,11 +54,8 @@ fn main() {
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
| - | |
|
|
|
|
|
modified src/broker.rs
@@ -5,11 +5,9 @@
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -17,6 +15,7 @@ use radicle::prelude::RepoId;
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -35,7 +34,7 @@ pub struct Broker {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -66,8 +65,7 @@ impl Broker {
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -104,24 +102,17 @@ impl Broker {
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -188,7 +179,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -309,8 +300,6 @@ echo '{"response":"finished","result":"success"}'
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
modified src/db.rs
@@ -16,7 +16,6 @@ use std::{
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -38,7 +37,6 @@ impl Db {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -46,7 +44,6 @@ impl Db {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -96,7 +93,6 @@ impl Db {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -106,7 +102,6 @@ impl Db {
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified src/event.rs
@@ -27,7 +27,6 @@
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -43,6 +42,8 @@ use std::{
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -57,30 +58,18 @@ impl NodeEventSource {
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -94,11 +83,9 @@ impl NodeEventSource {
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -107,45 +94,34 @@ impl NodeEventSource {
|
|
|
|
|
|
| - | |
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -353,15 +329,12 @@ impl BrokerEvent {
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -375,37 +348,20 @@ impl BrokerEvent {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
|
|
|
|
|
@@ -426,18 +382,17 @@ impl BrokerEvent {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -564,18 +519,13 @@ pub enum ParsedRef {
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
|
| - | |
|
|
| - | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -583,40 +533,26 @@ pub fn parse_ref(s: &str) -> Result<Option<ParsedRef>, NodeEventError> {
|
|
|
|
|
|
| - | |
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -628,7 +564,6 @@ mod test_parse_ref {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -640,7 +575,6 @@ mod test_parse_ref {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -672,11 +606,10 @@ pub fn push_branch(name: &str) -> String {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -691,7 +624,6 @@ mod test {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -708,7 +640,6 @@ mod test {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -717,7 +648,6 @@ mod test {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -728,7 +658,6 @@ mod test {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -739,7 +668,6 @@ mod test {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -750,7 +678,6 @@ mod test {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -761,7 +688,6 @@ mod test {
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified src/logger.rs
@@ -1,34 +1,224 @@
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
modified src/pages.rs
@@ -17,7 +17,6 @@ use std::{
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -30,6 +29,7 @@ use radicle::{
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -96,7 +96,7 @@ impl PageBuilder {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -525,15 +525,15 @@ impl StatusPage {
|
|
|
|
|
|
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -541,35 +541,26 @@ impl StatusPage {
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -655,7 +646,6 @@ impl StatusPage {
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified src/queueadd.rs
@@ -2,11 +2,10 @@ use std::thread::{spawn, JoinHandle};
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -62,31 +61,26 @@ impl QueueAdder {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -95,10 +89,10 @@ impl QueueAdder {
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified src/queueproc.rs
@@ -8,13 +8,13 @@ use std::{
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -75,38 +75,30 @@ impl QueueProcessor {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -131,7 +123,7 @@ impl QueueProcessor {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -144,14 +136,14 @@ impl QueueProcessor {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified src/test.rs
@@ -90,11 +90,3 @@ pub fn mock_adapter(filename: &Path, script: &str) -> TestResult<Adapter> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |