zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict in collab (#9550)

Browse Source 
Release Notes:

- N/A
This commit is contained in:
Conrad Irwin 2024-03-19 16:02:33 -06:00 committed by GitHub
parent 86a86a9635
commit 5139aa3811
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/collab/src/main.rs
View File

@ -67,16 +67,6 @@ async fn main() -> Result<()> {
let listener = TcpListener::bind(&format!("0.0.0.0:{}", state.config.http_port)) let listener = TcpListener::bind(&format!("0.0.0.0:{}", state.config.http_port))
.expect("failed to bind TCP listener"); .expect("failed to bind TCP listener");
let epoch = state
.db
.create_server(&state.config.zed_environment)
.await?;
let rpc_server = collab::rpc::Server::new(epoch, state.clone());
rpc_server.start().await?;
fetch_extensions_from_blob_store_periodically(state.clone());
RateLimiter::save_periodically(state.rate_limiter.clone(), state.executor.clone());
let rpc_server = if is_collab { let rpc_server = if is_collab {
let epoch = state let epoch = state
.db .db
@ -90,6 +80,10 @@ async fn main() -> Result<()> {
None None
}; };
if is_collab {
RateLimiter::save_periodically(state.rate_limiter.clone(), state.executor.clone());
}
if is_api { if is_api {
fetch_extensions_from_blob_store_periodically(state.clone()); fetch_extensions_from_blob_store_periodically(state.clone());
} }