fixes-4
This commit is contained in:
parent
152a8da157
commit
3d12dc0f6a
|
@ -6,7 +6,7 @@ use serde_json::Value;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::error::Error;
|
use std::error::Error;
|
||||||
use futures::{StreamExt, FutureExt};
|
use futures::StreamExt;
|
||||||
use tokio::sync::broadcast::{self, Receiver};
|
use tokio::sync::broadcast::{self, Receiver};
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
@ -54,7 +54,7 @@ async fn get_auth_id(token: &str) -> Result<i32, Box<dyn Error>> {
|
||||||
|
|
||||||
async fn sse_handler(
|
async fn sse_handler(
|
||||||
token: web::Path<String>,
|
token: web::Path<String>,
|
||||||
rx: web::Data<Receiver<String>>,
|
mut rx: web::Data<Receiver<String>>,
|
||||||
redis: web::Data<Client>,
|
redis: web::Data<Client>,
|
||||||
) -> impl Responder {
|
) -> impl Responder {
|
||||||
let author_id = match get_auth_id(&token).await {
|
let author_id = match get_auth_id(&token).await {
|
||||||
|
@ -81,7 +81,6 @@ async fn sse_handler(
|
||||||
pubsub.subscribe(format!("message:{}", chat_id)).await.unwrap();
|
pubsub.subscribe(format!("message:{}", chat_id)).await.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut rx = rx.get_ref().subscribe();
|
|
||||||
let server_event = rx.recv().await.unwrap();
|
let server_event = rx.recv().await.unwrap();
|
||||||
|
|
||||||
let _: () = con
|
let _: () = con
|
||||||
|
@ -96,7 +95,7 @@ async fn sse_handler(
|
||||||
|
|
||||||
#[actix_web::main]
|
#[actix_web::main]
|
||||||
async fn main() -> std::io::Result<()> {
|
async fn main() -> std::io::Result<()> {
|
||||||
let (tx, mut rx) = broadcast::channel(100);
|
let (tx, _rx) = broadcast::channel(100);
|
||||||
let redis_url = env::var("REDIS_URL").unwrap();
|
let redis_url = env::var("REDIS_URL").unwrap();
|
||||||
let client = redis::Client::open(redis_url).unwrap();
|
let client = redis::Client::open(redis_url).unwrap();
|
||||||
let _handle = tokio::spawn(async move {
|
let _handle = tokio::spawn(async move {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user