mvarjon/plan9 - Change IX73DI3JJBWPP7NDCWXD6OFZVHC6LPEMEWUGLAO2W3DW2UZPDLNAC

Setup logging infrastructure.

Created by mvarjon on August 3, 2022

IX73DI3JJBWPP7NDCWXD6OFZVHC6LPEMEWUGLAO2W3DW2UZPDLNAC

Dependencies

In channels

main

Change contents

Replacement in src/server.rs at line 1 [2.34]

B:BD[2.34] → [2.35:482]

use crate::mediator::{Mediator, Message};
pub struct Server {
    mediator: Mediator,
}
impl Server {
    pub fn new() -> Self {
        let mut mediator = Mediator::new();
        // Bootstrap the components to the mediator.
        Self { mediator }
    }
    pub fn run(&mut self) {
        loop {
            // Use the tokio framework here to run the server loop
            // which handles incoming network requests.
        }
    }
}

[2.34]

use crate::mediator::{Mediator, Message};
use log::info;
pub struct Server {
    mediator: Mediator,
}
impl Server {
    pub fn new() -> Self {
        info!("BOOT: Started");
        let mut mediator = Mediator::new();
        // Bootstrap the components to the mediator.
        info!("BOOT: Ready");
        Self { mediator }
    }
    pub fn run(&mut self) {
        info!("SERVER: Running");
        loop {
            // Use the tokio framework here to run the server loop
            // which handles incoming network requests.
        }
    }
}

Replacement in src/mediator.rs at line 1 [3.36]

B:BD[3.36] → [2.483:2595]

use std::collections::HashMap;
use std::sync::RwLock;
pub struct Message {
    pub kind: String,
    pub json: String,
}
pub type Implementation = fn(&Message) -> ();
struct MessageHandler {
    implementation: Implementation,
    message: Message,
}
impl MessageHandler {
    pub fn new(implementation: Implementation, message: Message) -> Self {
        Self {
            implementation,
            message,
        }
    }
    pub fn handle(&self) {
        let _ = &(self.implementation)(&self.message);
    }
}
pub struct Mediator {
    storage: RwLock<HashMap<String, Vec<Implementation>>>,
}
impl Mediator {
    pub fn new() -> Self {
        let data = HashMap::with_capacity(100);
        let storage = RwLock::new(data);
        Self { storage }
    }
    pub fn add(&mut self, kind: String, handler: Implementation) {
        let key = kind.clone();
        let mut backing = self.storage.write().unwrap();
        let target = &mut *backing;
        if target.contains_key(&key) {
            let handlers = target.get_mut(&key).unwrap();
            handlers.push(handler);
        } else {
            let mut handlers: Vec<Implementation> = Vec::new();
            handlers.push(handler);
            target.insert(key, handlers);
        }
    }
    pub fn invoke(&self, msg: &Message) {
        let kind = msg.kind.clone();
        let json = msg.json.clone();
        let backing = self.storage.read().unwrap();
        let target = &*backing;
        if !target.contains_key(&msg.kind) {
            return;
        }
        let handlers = target.get(&msg.kind).unwrap();
        for handler in handlers {
            let c_kind = kind.clone();
            let c_json = json.clone();
            let c_handler = (*handler).clone();
            tokio::spawn(async move {
                let wrapper = MessageHandler::new(
                    c_handler,
                    Message {
                        kind: c_kind,
                        json: c_json,
                    },
                );
                wrapper.handle();
            });
        }
    }
}

[3.36]

use std::collections::HashMap;
use std::sync::RwLock;
pub struct Message {
    pub kind: String,
    pub json: String,
}
pub type Implementation = fn(&Message) -> ();
struct MessageHandler {
    implementation: Implementation,
    message: Message,
}
impl MessageHandler {
    pub fn new(implementation: Implementation, message: Message) -> Self {
        Self {
            implementation,
            message,
        }
    }
    pub fn handle(&self) {
        let _ = &(self.implementation)(&self.message);
    }
}
pub struct Mediator {
    storage: RwLock<HashMap<String, Vec<Implementation>>>,
}
impl Mediator {
    pub fn new() -> Self {
        let data = HashMap::with_capacity(100);
        let storage = RwLock::new(data);
        Self { storage }
    }
    pub fn add(&mut self, kind: String, handler: Implementation) {
        let key = kind.clone();
        let mut backing = self.storage.write().unwrap();
        let target = &mut *backing;
        if target.contains_key(&key) {
            let handlers = target.get_mut(&key).unwrap();
            handlers.push(handler);
        } else {
            let mut handlers: Vec<Implementation> = Vec::new();
            handlers.push(handler);
            target.insert(key, handlers);
        }
    }
    pub fn invoke(&self, msg: &Message) {
        let kind = msg.kind.clone();
        let json = msg.json.clone();
        let backing = self.storage.read().unwrap();
        let target = &*backing;
        if !target.contains_key(&msg.kind) {
            return;
        }
        let handlers = target.get(&msg.kind).unwrap();
        for handler in handlers {
            let c_kind = kind.clone();
            let c_json = json.clone();
            let c_handler = (*handler).clone();
            tokio::spawn(async move {
                let wrapper = MessageHandler::new(
                    c_handler,
                    Message {
                        kind: c_kind,
                        json: c_json,
                    },
                );
                wrapper.handle();
            });
        }
    }
}

Insertion in src/main.rs at line 2 [5.49]
[2.2623]
[4.804]
```
use log::error;
use log::info;
use log4rs;
```

Insertion in src/main.rs at line 11 [5.49]

[6.1713]

[6.1754]

    let _handle = log4rs::init_file("log4rs.config.yml", Default::default()).unwrap();
    info!("MAIN: INIT STARTED");
    info!("MAIN: v0.1.0");

Replacement in src/main.rs at line 26 [5.49]

B:BD[7.2374] → [2.2701:2774]

        Err(server_fault) => println!("SERVER ERROR: {}", server_fault),

[7.2374]

[4.1212]

        Err(server_fault) => error!("SERVER: RUNTIME ERROR = {}", server_fault),

File addition: log4rs.config.yml (----------)

[8.1]

refresh_rate: 30 seconds
appenders:
  stdout:
    kind: console
root:
  level: trace
  appenders:
    - stdout

Replacement in Cargo.toml at line 11 [5.123]

B:BD[5.395] → [9.1133:1179]

tokio = { version = "1", features = ["full"] }

[5.395]

log = "0.4.17"
tokio = { version = "1", features = ["full"] }
log4rs = { version = "1", features = ["all_components"] }

Insertion in Cargo.lock at line 4 [5.431]

[5.535]

[9.1180]


[[package]]
name = "anyhow"
version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9"
[[package]]
name = "arc-swap"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"

Insertion in Cargo.lock at line 40 [5.431]

[9.1942]


[[package]]
name = "chrono"
version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
dependencies = [
 "libc",
 "num-integer",
 "num-traits",
 "time",
 "winapi",
]
[[package]]
name = "derivative"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
 "proc-macro2",
 "quote",
 "syn",
]

Insertion in Cargo.lock at line 66 [5.431]

[9.1955]

name = "fnv"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]

Insertion in Cargo.lock at line 87 [5.431]

[9.2178]

name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "indexmap"
version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
dependencies = [
 "autocfg",
 "hashbrown",
]
[[package]]
name = "itoa"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
[[package]]

Insertion in Cargo.lock at line 115 [5.431]

[9.2368]

name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]

Insertion in Cargo.lock at line 137 [5.431]

[9.2809]

 "serde",
]
[[package]]
name = "log-mdc"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7"
[[package]]
name = "log4rs"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "893eaf59f4bef8e2e94302adf56385db445a0306b9823582b0b8d5a06d8822f3"
dependencies = [
 "anyhow",
 "arc-swap",
 "chrono",
 "derivative",
 "fnv",
 "humantime",
 "libc",
 "log",
 "log-mdc",
 "parking_lot",
 "serde",
 "serde-value",
 "serde_json",
 "serde_yaml",
 "thiserror",
 "thread-id",
 "typemap",
 "winapi",

Insertion in Cargo.lock at line 176 [5.431]
[9.2829]
[9.2829]
```
 "log",
 "log4rs",
```
Replacement in Cargo.lock at line 195 [5.431]
B:BD[9.3252] → [9.3252:3261]
```
 "wasi",
```
[9.3252]
[9.3261]
```
 "wasi 0.11.0+wasi-snapshot-preview1",
```

Insertion in Cargo.lock at line 197 [5.431]

[9.3277]

]
[[package]]
name = "num-integer"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
 "autocfg",
 "num-traits",

Insertion in Cargo.lock at line 210 [5.431]

[9.3292]

name = "num-traits"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
 "autocfg",
]
[[package]]

Insertion in Cargo.lock at line 235 [5.431]

[9.3722]

name = "ordered-float"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
dependencies = [
 "num-traits",
]
[[package]]

Insertion in Cargo.lock at line 300 [5.431]

[9.5145]

name = "ryu"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
[[package]]

Insertion in Cargo.lock at line 310 [5.431]

[9.5326]


[[package]]
name = "serde"
version = "1.0.142"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2"
dependencies = [
 "serde_derive",
]
[[package]]
name = "serde-value"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
dependencies = [
 "ordered-float",
 "serde",
]
[[package]]
name = "serde_derive"
version = "1.0.142"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e"
dependencies = [
 "proc-macro2",
 "quote",
 "syn",
]
[[package]]
name = "serde_json"
version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
dependencies = [
 "itoa",
 "ryu",
 "serde",
]

Insertion in Cargo.lock at line 353 [5.431]

[9.5339]

name = "serde_yaml"
version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
dependencies = [
 "indexmap",
 "ryu",
 "serde",
 "yaml-rust",
]
[[package]]

Insertion in Cargo.lock at line 398 [5.431]

[9.6229]

]
[[package]]
name = "thiserror"
version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
dependencies = [
 "thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
dependencies = [
 "proc-macro2",
 "quote",
 "syn",

Insertion in Cargo.lock at line 421 [5.431]

[9.6244]

name = "thread-id"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f"
dependencies = [
 "libc",
 "redox_syscall",
 "winapi",
]
[[package]]
name = "time"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
 "libc",
 "wasi 0.10.0+wasi-snapshot-preview1",
 "winapi",
]
[[package]]

Insertion in Cargo.lock at line 472 [5.431]

[9.6866]

]
[[package]]
name = "traitobject"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
[[package]]
name = "typemap"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6"
dependencies = [
 "unsafe-any",

Insertion in Cargo.lock at line 496 [5.431]

[9.7078]

name = "unsafe-any"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
dependencies = [
 "traitobject",
]
[[package]]

Insertion in Cargo.lock at line 506 [5.431]

[9.7092]

version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
[[package]]
name = "wasi"

Insertion in Cargo.lock at line 580 [5.431]

[9.9317]


[[package]]
name = "yaml-rust"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
dependencies = [
 "linked-hash-map",
]