chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: update nginx config for import (#935)

This commit is contained in:
Nathan.fooo 2024-10-25 16:47:29 +08:00 committed by GitHub
parent 359d686b27
commit 246cbd3ec4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@ -2239,7 +2239,7 @@ dependencies = [
[[package]] [[package]]
name = "collab" name = "collab"
version = "0.2.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
@ -2264,7 +2264,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-database" name = "collab-database"
version = "0.2.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -2303,7 +2303,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-document" name = "collab-document"
version = "0.2.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
@ -2324,7 +2324,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-entity" name = "collab-entity"
version = "0.2.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -2344,7 +2344,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-folder" name = "collab-folder"
version = "0.2.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
@ -2366,7 +2366,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-importer" name = "collab-importer"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"async-recursion", "async-recursion",
@ -2469,7 +2469,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-user" name = "collab-user"
version = "0.2.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"collab", "collab",

14
Cargo.toml
View File

@ -304,13 +304,13 @@ debug = true
[patch.crates-io] [patch.crates-io]
# It's diffcult to resovle different version with the same crate used in AppFlowy Frontend and the Client-API crate. # 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. # So using patch to workaround this issue.
collab = { 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 = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" }
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" }
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" }
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" }
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" }
collab-importer = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ded99c0bf6f41089c87de9a718c784c00b8255e5" } collab-importer = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4bd78daec6d4bce5cb0c0be8d2536973aff2861d" }
[features] [features]
history = [] history = []

16
nginx/nginx.conf
View File

@ -92,16 +92,17 @@ http {
set $appflowy_cloud appflowy_cloud; set $appflowy_cloud appflowy_cloud;
proxy_pass http://$appflowy_cloud:8000; proxy_pass http://$appflowy_cloud:8000;
# Set headers
proxy_set_header X-Request-Id $request_id; proxy_set_header X-Request-Id $request_id;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
# Handle CORS # Handle CORS
if ($http_origin ~* (http://127.0.0.1:8000)) { if ($http_origin ~* (http://127.0.0.1:8000)) {
add_header 'Access-Control-Allow-Origin' $http_origin always; 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-Methods' 'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Accept'; add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Accept' always;
add_header 'Access-Control-Max-Age' 3600; add_header 'Access-Control-Max-Age' 3600 always;
# Timeouts # Timeouts
proxy_read_timeout 600s; proxy_read_timeout 600s;
@ -110,6 +111,9 @@ http {
# Disable buffering for large file uploads # Disable buffering for large file uploads
proxy_request_buffering off; proxy_request_buffering off;
proxy_buffering off;
proxy_cache off;
client_max_body_size 2G;
} }
location /api { location /api {
@ -130,10 +134,6 @@ http {
add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Accept, Client-Version' always; add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Accept, Client-Version' always;
add_header 'Access-Control-Max-Age' 3600 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$ { location ~* ^/api/workspace/([a-zA-Z0-9_-]+)/publish$ {
set $appflowy_cloud appflowy_cloud; set $appflowy_cloud appflowy_cloud;
proxy_pass http://$appflowy_cloud:8000; proxy_pass http://$appflowy_cloud:8000;

10
services/appflowy-worker/src/import_worker/worker.rs
View File

@ -301,6 +301,12 @@ async fn process_task(
metrics, metrics,
) )
.await; .await;
trace!(
"[Import]: {} download and unzip file result: {:?}",
task.workspace_id,
unzip_result
);
match unzip_result { match unzip_result {
Ok(unzip_dir_path) => { Ok(unzip_dir_path) => {
// 2. process unzip file // 2. process unzip file
@ -545,6 +551,10 @@ async fn process_unzip_file(
) )
.map_err(ImportError::ImportCollabError)?; .map_err(ImportError::ImportCollabError)?;
trace!(
"[Import]: {} start import notion data",
import_task.workspace_id
);
let imported = notion_importer let imported = notion_importer
.import() .import()
.await .await