error reason can't be in nested json

This commit is contained in:
erikkaum 2024-07-19 11:35:23 +02:00
parent 01d6e0ba32
commit 0d03dc1d81
2 changed files with 11 additions and 6 deletions

View File

@ -415,7 +415,7 @@ async fn main() -> Result<(), RouterError> {
if let Some(ref ua) = user_agent {
let start_event =
usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Start);
usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Start, None);
tokio::spawn(async move {
start_event.send().await;
});
@ -459,7 +459,7 @@ async fn main() -> Result<(), RouterError> {
Ok(_) => {
if let Some(ref ua) = user_agent {
let stop_event =
usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Stop);
usage_stats::UsageStatsEvent::new(ua.clone(), usage_stats::EventType::Stop, None);
stop_event.send().await;
};
Ok(())
@ -469,13 +469,15 @@ async fn main() -> Result<(), RouterError> {
if !disable_crash_reports {
let error_event = usage_stats::UsageStatsEvent::new(
ua.clone(),
usage_stats::EventType::Error(e.to_string()),
usage_stats::EventType::Error,
Some(e.to_string()),
);
error_event.send().await;
} else {
let unknow_error_event = usage_stats::UsageStatsEvent::new(
ua.clone(),
usage_stats::EventType::Error("unknow_error".to_string()),
usage_stats::EventType::Error,
Some("unknow_error".to_string()),
);
unknow_error_event.send().await;
}

View File

@ -34,20 +34,23 @@ impl UserAgent {
pub enum EventType {
Start,
Stop,
Error(String),
Error,
}
#[derive(Debug, Serialize)]
pub struct UsageStatsEvent {
user_agent: UserAgent,
event_type: EventType,
#[serde(skip_serializing_if = "Option::is_none")]
error_reason: Option<String>,
}
impl UsageStatsEvent {
pub fn new(user_agent: UserAgent, event_type: EventType) -> Self {
pub fn new(user_agent: UserAgent, event_type: EventType, error_reason: Option<String>) -> Self {
Self {
user_agent,
event_type,
error_reason,
}
}
pub async fn send(&self) {