tensamin/omikron
Watch
6
0
Fork
You've already forked omikron
 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

i merged wrong :D

Browse source
This commit is contained in:
Alex Emmet 2025-11-11 21:48:22 +00:00
commit 3c0344ef64
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -5,10 +5,7 @@ mod omega;
mod rho; mod rho;
mod util; mod util;
<<<<<<< HEAD
use async_tungstenite::accept_hdr_async; use async_tungstenite::accept_hdr_async;
=======
>>>>>>> db419d3b4775949255dd2a89fbd782d15c02293e
use futures::StreamExt; use futures::StreamExt;
use std::{sync::Arc, time::Duration}; use std::{sync::Arc, time::Duration};
use tokio::net::TcpListener; use tokio::net::TcpListener;
@ -26,7 +23,6 @@ use crate::{
util::print::{PrintType, line, line_err, print_start_message}, util::print::{PrintType, line, line_err, print_start_message},
}; };
<<<<<<< HEAD
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
print_start_message(); print_start_message();
@ -36,16 +32,7 @@ async fn main() {
}); });
let address = format!("{}:{}", &CONFIG.read().await.ip, &CONFIG.read().await.port); let address = format!("{}:{}", &CONFIG.read().await.ip, &CONFIG.read().await.port);
let listener = TcpListener::bind(&address).await.unwrap(); let listener = TcpListener::bind(&address).await.unwrap();
=======
#[tokio::main(flavor = "multi_thread", worker_threads = 32)]
#[allow(unused_must_uscae, dead_code)]
async fn main() {
print_start_message();
tokio::spawn(async move {
OmegaConnection::new().connect().await;
});
let listener = TcpListener::bind("0.0.0.0:959").await.unwrap();
>>>>>>> db419d3b4775949255dd2a89fbd782d15c02293e
line( line(
PrintType::General, PrintType::General,
&format!("WebSocket server listening on {}", &address), &format!("WebSocket server listening on {}", &address),