merge
This commit is contained in:
commit
ab416c9c02
5 changed files with 336 additions and 6 deletions
14
src/main.rs
14
src/main.rs
|
|
@ -37,8 +37,13 @@ async fn main() {
|
|||
log_in!("Incoming messages");
|
||||
log_out!("Outgoing messages");
|
||||
|
||||
let omikron_port: u16 = env::var("OMIKRON_PORT")
|
||||
.ok()
|
||||
.and_then(|s| s.parse().ok())
|
||||
.unwrap_or(9187);
|
||||
|
||||
tokio::spawn(async move {
|
||||
match omikron_connection::start(9187).await {
|
||||
match omikron_connection::start(omikron_port).await {
|
||||
Err(e) => log_err!(0, PrintType::General, "{:?}", e),
|
||||
_ => {}
|
||||
}
|
||||
|
|
@ -68,7 +73,12 @@ async fn main() {
|
|||
log!(" Users");
|
||||
}
|
||||
|
||||
let _ = server::server::start(9188).await;
|
||||
let api_port: u16 = env::var("API_PORT")
|
||||
.ok()
|
||||
.and_then(|s| s.parse().ok())
|
||||
.unwrap_or(9188);
|
||||
|
||||
let _ = server::server::start(api_port).await;
|
||||
|
||||
tokio::signal::ctrl_c().await.unwrap();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue