chore: fmt

Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
Kasper Juul Hermansen 2023-08-27 19:57:16 +02:00
parent 43ed89d0d8
commit 86cfc18076
Signed by: kjuulh
GPG Key ID: 9AA7BC13CE474394
2 changed files with 51 additions and 24 deletions

View File

@ -1,14 +1,10 @@
use std::sync::Arc; use std::sync::Arc;
use axum::async_trait; use axum::async_trait;
use churn_domain::{LogEvent}; use churn_domain::LogEvent;
use itertools::Itertools; use itertools::Itertools;
use churn_capnp::CapnpPackExt; use churn_capnp::CapnpPackExt;
use crate::db::Db; use crate::db::Db;
@ -52,6 +48,7 @@ pub trait EventServiceTrait {
async fn append(&self, req: LogEvent) -> anyhow::Result<()>; async fn append(&self, req: LogEvent) -> anyhow::Result<()>;
async fn get_from_cursor(&self, cursor: uuid::Uuid) -> anyhow::Result<Vec<LogEvent>>; async fn get_from_cursor(&self, cursor: uuid::Uuid) -> anyhow::Result<Vec<LogEvent>>;
async fn get_from_beginning(&self) -> anyhow::Result<Vec<LogEvent>>; async fn get_from_beginning(&self) -> anyhow::Result<Vec<LogEvent>>;
async fn get_latest_cursor(&self) -> anyhow::Result<uuid::Uuid>;
} }
#[async_trait] #[async_trait]
@ -93,4 +90,25 @@ impl EventServiceTrait for DefaultEventService {
Ok(events) Ok(events)
} }
async fn get_latest_cursor(&self) -> anyhow::Result<uuid::Uuid> {
let events = self.db.get_all("events_log").await?;
let event = events
.iter()
.flat_map(|e| match LogEvent::deserialize_capnp(e) {
Ok(o) => Ok(o),
Err(e) => {
tracing::error!("failed to deserialize capnp: {e}");
Err(e)
}
})
.sorted_by_key(|i| i.timestamp)
.last();
match event {
Some(x) => Ok(x.id),
None => anyhow::bail!("no events found"),
}
}
} }

View File

@ -19,7 +19,7 @@ use churn_domain::{Agent, LeaseResp, LogEvent, ServerEnrollReq, ServerMonitorRes
use clap::{Args, Parser, Subcommand, ValueEnum}; use clap::{Args, Parser, Subcommand, ValueEnum};
use event::EventService; use event::EventService;
use lease::LeaseService; use lease::LeaseService;
use serde::{Deserialize}; use serde::Deserialize;
use serde_json::json; use serde_json::json;
use crate::db::Db; use crate::db::Db;
@ -208,24 +208,33 @@ async fn logs(
} }
} }
let events = match cursor.cursor { match cursor.cursor {
Some(c) => state.events.get_from_cursor(c).await, Some(c) => {
None => state.events.get_from_beginning().await, let events = state
} .events
.map_err(AppError::Internal)?; .get_from_cursor(c)
.await
.map_err(AppError::Internal)?;
if events.is_empty() { Ok(Json(ServerMonitorResp {
return Ok(Json(ServerMonitorResp { cursor: events.last().map(|e| e.id),
cursor: cursor.cursor, logs: events
logs: Vec::new(), .iter()
})); .map(|e| format!("{}: {}", e.author, e.content))
} .collect(),
}))
}
None => {
let cursor = state
.events
.get_latest_cursor()
.await
.map_err(AppError::Internal)?;
Ok(Json(ServerMonitorResp { return Ok(Json(ServerMonitorResp {
cursor: events.last().map(|e| e.id), cursor: Some(cursor),
logs: events logs: Vec::new(),
.iter() }));
.map(|e| format!("{}: {}", e.author, e.content)) }
.collect(), }
}))
} }