@@ -1,13 +1,13 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::async_trait;
|
||||
|
||||
use churn_domain::{LogEvent, ServerEnrollReq};
|
||||
use churn_domain::{LogEvent};
|
||||
use itertools::Itertools;
|
||||
use serde::{ser::SerializeStruct, Deserialize, Serialize};
|
||||
use tokio::sync::{Mutex, RwLock};
|
||||
|
||||
|
||||
|
||||
use churn_capnp::CapnpPackExt;
|
||||
|
||||
@@ -68,14 +68,13 @@ impl EventServiceTrait for DefaultEventService {
|
||||
|
||||
let events = events
|
||||
.iter()
|
||||
.map(|e| match LogEvent::deserialize_capnp(e) {
|
||||
.flat_map(|e| match LogEvent::deserialize_capnp(e) {
|
||||
Ok(o) => Ok(o),
|
||||
Err(e) => {
|
||||
tracing::error!("failed to deserialize capnp: {e}");
|
||||
Err(e)
|
||||
}
|
||||
})
|
||||
.flatten()
|
||||
.sorted_by_key(|i| i.timestamp)
|
||||
.skip_while(|item| item.id != cursor)
|
||||
.skip(1)
|
||||
@@ -88,8 +87,7 @@ impl EventServiceTrait for DefaultEventService {
|
||||
|
||||
let events = events
|
||||
.iter()
|
||||
.map(|e| LogEvent::deserialize_capnp(e))
|
||||
.flatten()
|
||||
.flat_map(LogEvent::deserialize_capnp)
|
||||
.sorted_by_key(|i| i.timestamp)
|
||||
.collect();
|
||||
|
||||
|
Reference in New Issue
Block a user