mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-19 02:17:35 +03:00
Make collab quieter on startup (#8685)
Fix initialization of minio to happen on service start instead of bootstrap, don't log errors if extensions are empty or if clickhouse is disabled Release Notes: - N/A
This commit is contained in:
parent
64460e492a
commit
400fb12f7e
2
Procfile
2
Procfile
@ -1,3 +1,3 @@
|
|||||||
collab: RUST_LOG=${RUST_LOG:-warn,tower_http=info,collab=info} cargo run --package=collab serve
|
collab: RUST_LOG=${RUST_LOG:-warn,tower_http=info,collab=info} cargo run --package=collab serve
|
||||||
livekit: livekit-server --dev
|
livekit: livekit-server --dev
|
||||||
blob_store: MINIO_ROOT_USER=the-blob-store-access-key MINIO_ROOT_PASSWORD=the-blob-store-secret-key minio server .blob_store
|
blob_store: ./script/run-local-minio
|
||||||
|
@ -147,9 +147,7 @@ async fn fetch_extensions_from_blob_store(
|
|||||||
.send()
|
.send()
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let objects = list
|
let objects = list.contents.unwrap_or_default();
|
||||||
.contents
|
|
||||||
.ok_or_else(|| anyhow!("missing bucket contents"))?;
|
|
||||||
|
|
||||||
let mut published_versions = HashMap::<&str, Vec<&str>>::default();
|
let mut published_versions = HashMap::<&str, Vec<&str>>::default();
|
||||||
for object in &objects {
|
for object in &objects {
|
||||||
|
@ -176,7 +176,7 @@ impl AppState {
|
|||||||
db: Arc::new(db),
|
db: Arc::new(db),
|
||||||
live_kit_client,
|
live_kit_client,
|
||||||
blob_store_client: build_blob_store_client(&config).await.log_err(),
|
blob_store_client: build_blob_store_client(&config).await.log_err(),
|
||||||
clickhouse_client: build_clickhouse_client(&config).log_err(),
|
clickhouse_client: build_clickhouse_client(&config),
|
||||||
config,
|
config,
|
||||||
};
|
};
|
||||||
Ok(Arc::new(this))
|
Ok(Arc::new(this))
|
||||||
@ -218,30 +218,30 @@ async fn build_blob_store_client(config: &Config) -> anyhow::Result<aws_sdk_s3::
|
|||||||
Ok(aws_sdk_s3::Client::new(&s3_config))
|
Ok(aws_sdk_s3::Client::new(&s3_config))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn build_clickhouse_client(config: &Config) -> anyhow::Result<clickhouse::Client> {
|
fn build_clickhouse_client(config: &Config) -> Option<clickhouse::Client> {
|
||||||
Ok(clickhouse::Client::default()
|
let Some(url) = config.clickhouse_url.as_ref() else {
|
||||||
.with_url(
|
return None;
|
||||||
config
|
};
|
||||||
.clickhouse_url
|
Some(
|
||||||
.as_ref()
|
clickhouse::Client::default()
|
||||||
.ok_or_else(|| anyhow!("missing clickhouse_url"))?,
|
.with_url(url)
|
||||||
)
|
.with_user(
|
||||||
.with_user(
|
config
|
||||||
config
|
.clickhouse_user
|
||||||
.clickhouse_user
|
.as_ref()
|
||||||
.as_ref()
|
.expect("missing clickhouse_user"),
|
||||||
.ok_or_else(|| anyhow!("missing clickhouse_user"))?,
|
)
|
||||||
)
|
.with_password(
|
||||||
.with_password(
|
config
|
||||||
config
|
.clickhouse_password
|
||||||
.clickhouse_password
|
.as_ref()
|
||||||
.as_ref()
|
.expect("missing clickhouse_password"),
|
||||||
.ok_or_else(|| anyhow!("missing clickhouse_password"))?,
|
)
|
||||||
)
|
.with_database(
|
||||||
.with_database(
|
config
|
||||||
config
|
.clickhouse_database
|
||||||
.clickhouse_database
|
.as_ref()
|
||||||
.as_ref()
|
.expect("missing clickhouse_database"),
|
||||||
.ok_or_else(|| anyhow!("missing clickhouse_database"))?,
|
),
|
||||||
))
|
)
|
||||||
}
|
}
|
||||||
|
@ -3,10 +3,6 @@
|
|||||||
echo "installing foreman..."
|
echo "installing foreman..."
|
||||||
which foreman > /dev/null || brew install foreman
|
which foreman > /dev/null || brew install foreman
|
||||||
|
|
||||||
echo "installing minio..."
|
|
||||||
which minio > /dev/null || brew install minio/stable/minio
|
|
||||||
mkdir -p .blob_store/the-extensions-bucket
|
|
||||||
|
|
||||||
echo "creating database..."
|
echo "creating database..."
|
||||||
script/sqlx database create
|
script/sqlx database create
|
||||||
|
|
||||||
|
9
script/run-local-minio
Executable file
9
script/run-local-minio
Executable file
@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash -e
|
||||||
|
|
||||||
|
which minio > /dev/null || (echo "installing minio..."; brew install minio/stable/minio)
|
||||||
|
mkdir -p .blob_store/the-extensions-bucket
|
||||||
|
mkdir -p .blob_store/zed-crash-reports
|
||||||
|
|
||||||
|
export MINIO_ROOT_USER=the-blob-store-access-key
|
||||||
|
export MINIO_ROOT_PASSWORD=the-blob-store-secret-key
|
||||||
|
minio server --quiet .blob_store
|
Loading…
Reference in New Issue
Block a user