b64 log; ret if ws fail

OxfordAbstracts · Oct 22, 2024 · 6f129f5 · 6f129f5
1 parent 9d1cb7a
commit 6f129f5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/metrics/Cargo.lock b/metrics/Cargo.lock
diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml
@@ -13,6 +13,7 @@ log = "0.4.16"
 
 reqwest = { version = "0.11", features = ["json"]}
 
+base64 = "0.22.1"
 tokio = { version = "1.37", features = ["full"]}
 actix-web = "4.0.1"
 actix-ws = "0.3.0"

diff --git a/metrics/src/logprocessor.rs b/metrics/src/logprocessor.rs
@@ -2,6 +2,7 @@ use log::warn;
 
 use serde::Deserialize;
 use serde_json::{from_str, from_value};
+use base64::prelude::{Engine as _, BASE64_STANDARD_NO_PAD};
 use crate::Telemetry;
 
 use opentelemetry::{
@@ -220,7 +221,7 @@ pub async fn log_processor(logline: &String, metric_obj: &Telemetry, tracer: &tr
         }
         Err(e) => {
             warn!("Failed to parse log line: {}", e);
-            warn!("Line was: {}", logline);
+            warn!("Line was b64: {}", BASE64_STANDARD_NO_PAD.encode(logline));
         }
     };
 }
diff --git a/metrics/src/logreceiver.rs b/metrics/src/logreceiver.rs
@@ -19,8 +19,11 @@ async fn receive_log(
             if let Ok(Message::Text(text)) = msg {
                 let _ = logprocessor::log_processor(&text.trim().to_string(), &metric_obj, &tracer).await;
                 session.text("{\"success\": true}").await.unwrap();
+            } else {
+                // TODO: improve
+                warn!("Success: false");
+                session.text("{\"success\": false}").await.unwrap();
             }
-            // TODO: log if failed
         }
     });