vw_small

commit 527bc1f62519485ccc30d2e1328a1b8e66a38175
parent b636d20c6475bfb1b36561cb95812faee26ea7db
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Sat, 21 May 2022 19:17:15 +0200

Merge branch 'BlackDex-fix-upload-limits-and-logging' into main

Diffstat:
M
src/main.rs
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main.rs b/src/main.rs
@@ -336,10 +336,11 @@ async fn launch_rocket(pool: db::DbPool, extra_debug: bool) -> Result<(), Error>
 
     let mut config = rocket::Config::from(rocket::Config::figment());
     config.temp_dir = canonicalize(CONFIG.tmp_folder()).unwrap().into();
-    config.limits = Limits::new() //
-        .limit("json", 10.megabytes())
-        .limit("data-form", 150.megabytes())
-        .limit("file", 150.megabytes());
+    config.cli_colors = false; // Make sure Rocket does not color any values for logging.
+    config.limits = Limits::new()
+        .limit("json", 20.megabytes()) // 20MB should be enough for very large imports, something like 5000+ vault entries
+        .limit("data-form", 525.megabytes()) // This needs to match the maximum allowed file size for Send
+        .limit("file", 525.megabytes()); // This needs to match the maximum allowed file size for attachments
 
     // If adding more paths here, consider also adding them to
     // crate::utils::LOGGED_ROUTES to make sure they appear in the log