Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set editoast tokio flavor multi-thread #7924

Merged
merged 2 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
362 changes: 178 additions & 184 deletions editoast/Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion editoast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ serde_yaml = "0.9.34"
sha1 = "0.10"
strum.workspace = true
thiserror.workspace = true
tokio = "*"
tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] }
tokio-postgres = "*"
tracing.workspace = true
tracing-opentelemetry = "0.24.0"
Expand Down
2 changes: 1 addition & 1 deletion editoast/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##############
# Cargo chef #
##############
FROM lukemathwalker/cargo-chef:0.1.66-rust-latest AS chef
FROM lukemathwalker/cargo-chef:0.1.67-rust-latest AS chef
WORKDIR /app

#######################
Expand Down
2 changes: 2 additions & 0 deletions editoast/editoast_derive/src/modelv2/args.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::manual_unwrap_or_default)]

use super::RawIdentifier;
use darling::{
ast,
Expand Down
2 changes: 2 additions & 0 deletions editoast/editoast_derive/src/search.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::manual_unwrap_or_default)]

use std::sync::OnceLock;

use darling::{ast, util, Error, FromDeriveInput, FromField};
Expand Down
2 changes: 2 additions & 0 deletions editoast/src/core/conflicts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ pub struct TrainRequirements {

#[derive(Debug, Deserialize)]
pub struct ConflictDetectionResponse {
// TODO: Warnings should be forward to the client (for debugging purposes)
#[allow(dead_code)]
pub warnings: Vec<String>,
pub conflicts: Vec<CoreConflict>,
}
Expand Down
1 change: 1 addition & 0 deletions editoast/src/fixtures.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#[allow(dead_code)]
#[cfg(test)]
pub mod tests {
use std::io::Cursor;
Expand Down
2 changes: 1 addition & 1 deletion editoast/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ impl EditoastMode {
}
}

#[actix_web::main]
#[tokio::main]
async fn main() {
match run().await {
Ok(_) => (),
Expand Down
1 change: 1 addition & 0 deletions editoast/src/modelsv2/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
pub mod database;
pub mod documents;
pub mod electrical_profiles;
#[allow(unused)]
#[cfg(test)]
pub mod fixtures;
pub mod infra;
Expand Down
2 changes: 2 additions & 0 deletions editoast/src/views/search/objects.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::duplicated_attributes)]

use chrono::NaiveDateTime;
use editoast_derive::Search;
use editoast_derive::SearchConfigStore;
Expand Down
Loading