From 8eb6f5a8af3cc30168346b305097bac5e4654055 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 2 Nov 2021 13:41:08 +0000 Subject: [PATCH] chore(task_queue): add logging --- src/database/entities/message.rs | 16 +--------------- src/task_queue/task_ack.rs | 7 +++++++ src/task_queue/task_last_message_id.rs | 5 ++++- src/task_queue/task_process_embeds.rs | 2 ++ src/task_queue/task_web_push.rs | 2 ++ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/database/entities/message.rs b/src/database/entities/message.rs index c6a07182..462f9ba2 100644 --- a/src/database/entities/message.rs +++ b/src/database/entities/message.rs @@ -5,9 +5,7 @@ use crate::{ util::result::{Error, Result}, }; -use mongodb::{ - bson::{doc, to_bson, DateTime, Document}, -}; +use mongodb::bson::{doc, to_bson, DateTime}; use rocket::serde::json::Value; use serde::{Deserialize, Serialize}; use ulid::Ulid; @@ -325,15 +323,3 @@ impl Message { Ok(()) } } - -async fn update_channels_last_message(channels: &Collection, channel_id: &String, set: &Document) { - channels - .update_one( - doc! { "_id": channel_id }, - doc! { "$set": set }, - None, - ) - .await - .expect("Server should not run with no, or a corrupted db"); - -} diff --git a/src/task_queue/task_ack.rs b/src/task_queue/task_ack.rs index b6ba265f..0fb5844a 100644 --- a/src/task_queue/task_ack.rs +++ b/src/task_queue/task_ack.rs @@ -1,7 +1,10 @@ // Queue Type: Debounced +// TODO: Group similar events together with $in. + use std::{collections::HashMap, time::{Duration, Instant}}; use async_channel::{ Sender, Receiver, bounded }; +use log::info; use mongodb::{bson::doc, options::UpdateOptions}; use crate::database::*; @@ -76,6 +79,8 @@ pub async fn run() { ) .await .ok(); + + info!("Added mentions for {} in {}.", user, channel); }, AckEvent::AckMessage { id } => { unreads.update_one( @@ -95,6 +100,8 @@ pub async fn run() { ) .await .ok(); + + info!("User {} acknowledged {}.", user, channel); } } } diff --git a/src/task_queue/task_last_message_id.rs b/src/task_queue/task_last_message_id.rs index 54fc2e09..de7146de 100644 --- a/src/task_queue/task_last_message_id.rs +++ b/src/task_queue/task_last_message_id.rs @@ -2,6 +2,7 @@ use std::{collections::HashMap, time::{Duration, Instant}}; use async_channel::{ Sender, Receiver, bounded }; +use log::info; use mongodb::bson::doc; use crate::database::*; @@ -51,7 +52,7 @@ pub async fn run() { // Commit any due tasks to the database. for key in &keys { if let Some(Task { id, is_dm, .. }) = tasks.remove(key) { - let mut set = doc! { "last_message_id": id.clone() }; + let mut set = doc! { "last_message_id": &id }; if is_dm { set.insert("active", true); @@ -65,6 +66,8 @@ pub async fn run() { ) .await .ok(); + + info!("Updated last_message_id for {} to {}.", key, id); } } diff --git a/src/task_queue/task_process_embeds.rs b/src/task_queue/task_process_embeds.rs index 86512f18..be79b3e8 100644 --- a/src/task_queue/task_process_embeds.rs +++ b/src/task_queue/task_process_embeds.rs @@ -1,5 +1,6 @@ // Queue Type: Linear use async_channel::{ Sender, Receiver, bounded }; +use log::info; use mongodb::bson::{doc, to_bson}; use crate::{database::*, notifications::events::ClientboundNotification}; @@ -38,6 +39,7 @@ pub async fn run() { ) .await { + info!("Generated embeds for {}.", &id); ClientboundNotification::MessageUpdate { id, channel: channel.clone(), diff --git a/src/task_queue/task_web_push.rs b/src/task_queue/task_web_push.rs index 2b1628fa..6a373e93 100644 --- a/src/task_queue/task_web_push.rs +++ b/src/task_queue/task_web_push.rs @@ -63,6 +63,8 @@ pub async fn run() { let msg = builder.build().unwrap(); client.send(msg).await.ok(); + + info!("Sent Web Push notification to {:?}.", session.id); } } }