diff options
author | Dessalines <tyhou13@gmx.com> | 2020-01-15 22:01:14 -0500 |
---|---|---|
committer | Dessalines <tyhou13@gmx.com> | 2020-01-15 22:01:14 -0500 |
commit | 81c6d276d57d30395fad408dcefbbdefc9f3102b (patch) | |
tree | 1c4aeef48a972d0b9819f28e1278ec3b3c9f428a /server/src/main.rs | |
parent | 9845fda05c94b01f1b46ac1e1be87e899b3a24d3 (diff) |
Fix issue with adding multiple instances of chatserver.
Diffstat (limited to 'server/src/main.rs')
-rw-r--r-- | server/src/main.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index 3ac07233..636182aa 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -2,11 +2,13 @@ extern crate lemmy_server; #[macro_use] extern crate diesel_migrations; +use actix::prelude::*; use actix_web::*; use diesel::r2d2::{ConnectionManager, Pool}; use diesel::PgConnection; use lemmy_server::routes::{federation, feeds, index, nodeinfo, webfinger, websocket}; use lemmy_server::settings::Settings; +use lemmy_server::websocket::server::*; use std::io; embed_migrations!(); @@ -27,6 +29,9 @@ async fn main() -> io::Result<()> { let conn = pool.get().unwrap(); embedded_migrations::run(&conn).unwrap(); + // Set up websocket server + let server = ChatServer::startup(pool.clone()).start(); + println!( "Starting http server at {}:{}", settings.bind, settings.port @@ -37,6 +42,7 @@ async fn main() -> io::Result<()> { App::new() .wrap(middleware::Logger::default()) .data(pool.clone()) + .data(server.clone()) // The routes .configure(federation::config) .configure(feeds::config) |