diff --git a/Cargo.lock b/Cargo.lock index efc0b00d..dbe5ddaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2239,7 +2239,7 @@ dependencies = [ [[package]] name = "collab" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ded99c0bf6f41089c87de9a718c784c00b8255e5#ded99c0bf6f41089c87de9a718c784c00b8255e5" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4bd78daec6d4bce5cb0c0be8d2536973aff2861d#4bd78daec6d4bce5cb0c0be8d2536973aff2861d" dependencies = [ "anyhow", "arc-swap", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ded99c0bf6f41089c87de9a718c784c00b8255e5#ded99c0bf6f41089c87de9a718c784c00b8255e5" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4bd78daec6d4bce5cb0c0be8d2536973aff2861d#4bd78daec6d4bce5cb0c0be8d2536973aff2861d" dependencies = [ "anyhow", "async-trait", @@ -2303,7 +2303,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ded99c0bf6f41089c87de9a718c784c00b8255e5#ded99c0bf6f41089c87de9a718c784c00b8255e5" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4bd78daec6d4bce5cb0c0be8d2536973aff2861d#4bd78daec6d4bce5cb0c0be8d2536973aff2861d" dependencies = [ "anyhow", "arc-swap", @@ -2324,7 +2324,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ded99c0bf6f41089c87de9a718c784c00b8255e5#ded99c0bf6f41089c87de9a718c784c00b8255e5" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4bd78daec6d4bce5cb0c0be8d2536973aff2861d#4bd78daec6d4bce5cb0c0be8d2536973aff2861d" dependencies = [ "anyhow", "bytes", @@ -2344,7 +2344,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ded99c0bf6f41089c87de9a718c784c00b8255e5#ded99c0bf6f41089c87de9a718c784c00b8255e5" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4bd78daec6d4bce5cb0c0be8d2536973aff2861d#4bd78daec6d4bce5cb0c0be8d2536973aff2861d" dependencies = [ "anyhow", "arc-swap", @@ -2366,7 +2366,7 @@ dependencies = [ [[package]] name = "collab-importer" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ded99c0bf6f41089c87de9a718c784c00b8255e5#ded99c0bf6f41089c87de9a718c784c00b8255e5" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4bd78daec6d4bce5cb0c0be8d2536973aff2861d#4bd78daec6d4bce5cb0c0be8d2536973aff2861d" dependencies = [ "anyhow", "async-recursion", @@ -2469,7 +2469,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ded99c0bf6f41089c87de9a718c784c00b8255e5#ded99c0bf6f41089c87de9a718c784c00b8255e5" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=4bd78daec6d4bce5cb0c0be8d2536973aff2861d#4bd78daec6d4bce5cb0c0be8d2536973aff2861d" dependencies = [ "anyhow", "collab", diff --git a/Cargo.toml b/Cargo.toml index f15dbc05..6b96c84f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -304,13 +304,13 @@ debug = true [patch.crates-io] # It's diffcult to resovle different version with the same crate used in AppFlowy Frontend and the Client-API crate. # So using patch to workaround this issue. -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } -collab-importer = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" } +collab-importer = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" } [features] history = [] diff --git a/nginx/nginx.conf b/nginx/nginx.conf index bae29a74..05ca5f49 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -92,16 +92,17 @@ http { set $appflowy_cloud appflowy_cloud; proxy_pass http://$appflowy_cloud:8000; + # Set headers proxy_set_header X-Request-Id $request_id; proxy_set_header Host $http_host; - # Handle CORS + # Handle CORS if ($http_origin ~* (http://127.0.0.1:8000)) { add_header 'Access-Control-Allow-Origin' $http_origin always; } - add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, PATCH'; - add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Accept'; - add_header 'Access-Control-Max-Age' 3600; + add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, PATCH, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Accept' always; + add_header 'Access-Control-Max-Age' 3600 always; # Timeouts proxy_read_timeout 600s; @@ -110,6 +111,9 @@ http { # Disable buffering for large file uploads proxy_request_buffering off; + proxy_buffering off; + proxy_cache off; + client_max_body_size 2G; } location /api { @@ -130,10 +134,6 @@ http { add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Accept, Client-Version' always; add_header 'Access-Control-Max-Age' 3600 always; - location /api/import { - client_max_body_size 2G; - } - location ~* ^/api/workspace/([a-zA-Z0-9_-]+)/publish$ { set $appflowy_cloud appflowy_cloud; proxy_pass http://$appflowy_cloud:8000; diff --git a/services/appflowy-worker/src/import_worker/worker.rs b/services/appflowy-worker/src/import_worker/worker.rs index 95d2b296..1473c486 100644 --- a/services/appflowy-worker/src/import_worker/worker.rs +++ b/services/appflowy-worker/src/import_worker/worker.rs @@ -301,6 +301,12 @@ async fn process_task( metrics, ) .await; + + trace!( + "[Import]: {} download and unzip file result: {:?}", + task.workspace_id, + unzip_result + ); match unzip_result { Ok(unzip_dir_path) => { // 2. process unzip file @@ -545,6 +551,10 @@ async fn process_unzip_file( ) .map_err(ImportError::ImportCollabError)?; + trace!( + "[Import]: {} start import notion data", + import_task.workspace_id + ); let imported = notion_importer .import() .await