style: Applied formatting to MCP module
This commit is contained in:
+6
-2
@@ -1136,7 +1136,9 @@ pub fn run_llm_function(
|
|||||||
let mut reader = stdout;
|
let mut reader = stdout;
|
||||||
let mut out = io::stdout();
|
let mut out = io::stdout();
|
||||||
while let Ok(n) = reader.read(&mut buffer) {
|
while let Ok(n) = reader.read(&mut buffer) {
|
||||||
if n == 0 { break; }
|
if n == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
let chunk = &buffer[0..n];
|
let chunk = &buffer[0..n];
|
||||||
let mut last_pos = 0;
|
let mut last_pos = 0;
|
||||||
for (i, &byte) in chunk.iter().enumerate() {
|
for (i, &byte) in chunk.iter().enumerate() {
|
||||||
@@ -1159,7 +1161,9 @@ pub fn run_llm_function(
|
|||||||
buf
|
buf
|
||||||
});
|
});
|
||||||
|
|
||||||
let status = child.wait().map_err(|err| anyhow!("Unable to run {command_name}, {err}"))?;
|
let status = child
|
||||||
|
.wait()
|
||||||
|
.map_err(|err| anyhow!("Unable to run {command_name}, {err}"))?;
|
||||||
let _ = stdout_thread.join();
|
let _ = stdout_thread.join();
|
||||||
let stderr_bytes = stderr_thread.join().unwrap_or_default();
|
let stderr_bytes = stderr_thread.join().unwrap_or_default();
|
||||||
|
|
||||||
|
|||||||
+9
-4
@@ -197,7 +197,8 @@ impl McpRegistry {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let desired_ids = self.resolve_server_ids(enabled_mcp_servers);
|
let desired_ids = self.resolve_server_ids(enabled_mcp_servers);
|
||||||
let ids_to_start: Vec<String> = desired_ids.into_iter()
|
let ids_to_start: Vec<String> = desired_ids
|
||||||
|
.into_iter()
|
||||||
.filter(|id| !self.servers.contains_key(id))
|
.filter(|id| !self.servers.contains_key(id))
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
@@ -301,13 +302,15 @@ impl McpRegistry {
|
|||||||
|
|
||||||
fn resolve_server_ids(&self, enabled_mcp_servers: Option<String>) -> Vec<String> {
|
fn resolve_server_ids(&self, enabled_mcp_servers: Option<String>) -> Vec<String> {
|
||||||
if let Some(config) = &self.config
|
if let Some(config) = &self.config
|
||||||
&& let Some(servers) = enabled_mcp_servers {
|
&& let Some(servers) = enabled_mcp_servers
|
||||||
|
{
|
||||||
if servers == "all" {
|
if servers == "all" {
|
||||||
config.mcp_servers.keys().cloned().collect()
|
config.mcp_servers.keys().cloned().collect()
|
||||||
} else {
|
} else {
|
||||||
let enabled_servers: HashSet<String> =
|
let enabled_servers: HashSet<String> =
|
||||||
servers.split(',').map(|s| s.trim().to_string()).collect();
|
servers.split(',').map(|s| s.trim().to_string()).collect();
|
||||||
config.mcp_servers
|
config
|
||||||
|
.mcp_servers
|
||||||
.keys()
|
.keys()
|
||||||
.filter(|id| enabled_servers.contains(*id))
|
.filter(|id| enabled_servers.contains(*id))
|
||||||
.cloned()
|
.cloned()
|
||||||
@@ -330,7 +333,9 @@ impl McpRegistry {
|
|||||||
if let Some(server) = self.servers.remove(&id) {
|
if let Some(server) = self.servers.remove(&id) {
|
||||||
match Arc::try_unwrap(server) {
|
match Arc::try_unwrap(server) {
|
||||||
Ok(server_inner) => {
|
Ok(server_inner) => {
|
||||||
server_inner.cancel().await
|
server_inner
|
||||||
|
.cancel()
|
||||||
|
.await
|
||||||
.with_context(|| format!("Failed to stop MCP server: {id}"))?;
|
.with_context(|| format!("Failed to stop MCP server: {id}"))?;
|
||||||
info!("Stopped MCP server: {id}");
|
info!("Stopped MCP server: {id}");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user