Logging

Cargo.lock

@@ -30,6 +30,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 name = "forge-client"
 version = "0.1.0"
 dependencies = [
+ "paris",
  "serde",
  "serde_json",
  "tokio",
@@ -41,6 +42,7 @@ dependencies = [
 name = "forge-server"
 version = "0.1.0"
 dependencies = [
+ "paris",
  "serde",
  "serde_json",
  "tokio",
@@ -147,6 +149,12 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
 
+[[package]]
+name = "paris"
+version = "1.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fecab3723493c7851f292cb060f3ee1c42f19b8d749345d0d7eaf3fd19aa62d"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"

Cargo.toml

@@ -14,3 +14,4 @@ serde = { version = "1.0", features = ["derive"]}
 url = { version = "2.3.1", features = ["serde"]}
 uuid-simd = "0.8.0"
 uuid = { version = "1.3.0", features = ["v4", "fast-rng", "serde"] }
+paris = { version = "1.5", features = ["timestamps", "macros"] }

forge-client/Cargo.toml

@@ -9,3 +9,4 @@ serde_json.workspace = true
 serde.workspace = true
 url.workspace = true
 uuid.workspace = true
+paris.workspace = true

forge-client/src/main.rs

@@ -1,3 +1,4 @@
+use paris::{error, info, success};
 use serde::{Deserialize, Serialize};
 use std::error::Error;
 use std::fmt;
@@ -79,6 +80,7 @@ struct Message {
 async fn main() -> Result<(), Box<dyn Error>> {
     // Connect to a peer
     let mut stream = TcpStream::connect("127.0.0.1:9134").await?;
+    success!("Connected to: <green>127.0.0.1:9134<//>");
 
     let test_command = Command {
         build_system: BuildSystem::Cargo,
@@ -96,8 +98,11 @@ async fn main() -> Result<(), Box<dyn Error>> {
     };
 
     let j = serde_json::to_string(&test_message)?;
-    println!("{}", j);
     stream.write_all(&j.as_bytes()).await?;
+    info!(
+        "Sent JSON:\n<bright-white>{}<//>",
+        serde_json::to_string_pretty(&test_message)?
+    );
 
     Ok(())
 }

forge-server/Cargo.toml

@@ -10,3 +10,4 @@ serde.workspace = true
 url.workspace = true
 uuid-simd.workspace = true
 uuid.workspace = true
+paris.workspace = true

forge-server/src/main.rs

@@ -1,3 +1,4 @@
+use paris::{error, info, success};
 use serde::{Deserialize, Serialize};
 use serde_json::Result;
 use std::fmt;
@@ -92,21 +93,21 @@ async fn build(msg: Message, address: SocketAddr) {
         None => features = "".to_string(),
     }
 
-    println!(
-        "Received message from {:?}: {}",
+    success!(
+        "Received message from <green>{:?}<//>: <magenta>{}<//>\n<bright-white>git clone {}\n{} {} {} {}<//>",
         address,
-        msg.uuid.format_hyphenated()
+        msg.uuid.format_hyphenated(),
+        msg.repository,
+        msg.command.build_system,
+        msg.command.subcommand,
+        msg.command.tag,
+        features
     );
 
-    println!("git clone {}", msg.repository);
     match msg.pre_exec {
-        Some(e) => println!("Running pre-exec: {}", e),
+        Some(e) => info!("Running pre-exec: {}", e),
         None => {}
     }
-    println!(
-        "{} {} {} {}",
-        msg.command.build_system, msg.command.subcommand, msg.command.tag, features
-    );
 }
 
 async fn process_socket(mut socket: TcpStream, address: SocketAddr) {
@@ -124,7 +125,7 @@ async fn process_socket(mut socket: TcpStream, address: SocketAddr) {
         let json: Message = match serde_json::from_str(&line) {
             Ok(v) => v,
             Err(e) => {
-                eprintln!("{}", e);
+                error!("{}", e);
                 return;
             }
         };
@@ -139,7 +140,7 @@ async fn process_socket(mut socket: TcpStream, address: SocketAddr) {
 async fn main() -> io::Result<()> {
     let addr = "127.0.0.1:9134".to_string();
     let listener = TcpListener::bind(&addr).await?;
-    println!("Listening on: {}", addr);
+    info!("Listening on: <green>{}<//>", addr);
 
     loop {
         match listener.accept().await {
@@ -148,7 +149,7 @@ async fn main() -> io::Result<()> {
                     process_socket(socket, addr).await;
                 });
             }
-            Err(e) => eprintln!("couldn't get client: {:?}", e),
+            Err(e) => error!("couldn't get client: {:?}", e),
         }
     }
 }