From 5139aa38117a36e9e55abdcb047b9eafc84c6f45 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Tue, 19 Mar 2024 16:02:33 -0600 Subject: [PATCH] Fix merge conflict in collab (#9550) Release Notes: - N/A --- crates/collab/src/main.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs index 59b4d377af..6d92d2e8bd 100644 --- a/crates/collab/src/main.rs +++ b/crates/collab/src/main.rs @@ -67,16 +67,6 @@ async fn main() -> Result<()> { let listener = TcpListener::bind(&format!("0.0.0.0:{}", state.config.http_port)) .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 epoch = state .db @@ -90,6 +80,10 @@ async fn main() -> Result<()> { None }; + if is_collab { + RateLimiter::save_periodically(state.rate_limiter.clone(), state.executor.clone()); + } + if is_api { fetch_extensions_from_blob_store_periodically(state.clone()); }