Cleanup the output, colorise INFO log for the added events

tinythings · Feb 26, 2025 · 610c244 · 610c244
1 parent 75df0ca
commit 610c244
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/sysmaster/src/evtreg/kvdb.rs b/sysmaster/src/evtreg/kvdb.rs
@@ -1,4 +1,5 @@
 use chrono::{DateTime, Utc};
+use colored::Colorize;
 use libsysinspect::{
     SysinspectError,
     util::{self},
@@ -151,7 +152,6 @@ impl EventsRegistry {
         ) {
             Err(SysinspectError::MasterGeneralError(format!("{err}")))
         } else {
-            log::info!("Added event to {}", mid.id());
             Ok(())
         }
     }
@@ -160,12 +160,12 @@ impl EventsRegistry {
     pub fn open_session(&self, model: String, sid: String) -> Result<EventSession, SysinspectError> {
         let sessions = self.get_tree(TR_SESSIONS)?;
         if !sessions.contains_key(&sid)? {
-            log::debug!("Creating a new session: {sid}");
             // TODO: Timestamp must be original from the beginning of the cycle
-            let es = EventSession::new(model, sid.to_owned(), None);
+            let es = EventSession::new(model.to_owned(), sid.to_owned(), None);
             if let Err(err) = sessions.insert(&sid, es.as_bytes()?) {
                 return Err(SysinspectError::MasterGeneralError(format!("Error opening events session: {err}")));
             }
+            log::info!("Session {} for {} registered", sid.yellow(), model.bright_yellow());
             return Ok(es);
         } else if let Some(sb) = sessions.get(&sid)? {
             log::debug!("Returning an existing session: {sid}");

diff --git a/sysmaster/src/master.rs b/sysmaster/src/master.rs
@@ -16,7 +16,6 @@ use libsysinspect::{
         self, MasterMessage, MinionMessage, MinionTarget, ProtoConversion, errcodes::ProtoErrorCode, payload::ModStatePayload,
         rqtypes::RequestType,
     },
-    traits::SYS_NET_HOSTNAME,
     util::{self, iofs::scan_files_sha256},
 };
 use once_cell::sync::Lazy;
@@ -108,22 +107,8 @@ impl SysMaster {
         &mut self.mkr
     }
 
-    fn dumb_lister(&self) {
-        for s in self.evtreg.get_sessions().unwrap() {
-            log::warn!(">> SESSION: {} - {}", s.query(), s.get_ts_rfc3339());
-            for m in self.evtreg.get_minions(&s).unwrap() {
-                log::warn!(">> ... {} - {}", m.id(), util::dataconv::as_str(m.get_trait(SYS_NET_HOSTNAME).cloned()));
-                for e in self.evtreg.get_events(&s, &m).unwrap() {
-                    log::warn!(">> ... ... ({}) - {}: {:#?}", e.get_cycle_id(), e.get_event_id(), e.get_response());
-                }
-            }
-        }
-    }
-
     /// Construct a Command message to the minion
     fn msg_query(&mut self, payload: &str) -> Option<MasterMessage> {
-        self.dumb_lister();
-
         let query = payload.split(";").map(|s| s.to_string()).collect::<Vec<String>>();
 
         if let [querypath, query, traits, mid] = query.as_slice() {
@@ -322,7 +307,7 @@ impl SysMaster {
                             }
 
                             RequestType::Event => {
-                                log::info!("Event for {}: {}", req.id(), req.payload());
+                                log::debug!("Event for {}: {}", req.id(), req.payload());
                                 let c_master = Arc::clone(&master);
                                 tokio::spawn(async move {
                                     let mut m = c_master.lock().await;