clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
Gabriel Peal
2025-09-08 21:18:20 -07:00
parent bc7ef54c72
commit 176e80a5af
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
codex-rs/core/src/codex.rs
View File

@@ -1352,23 +1352,21 @@ async fn submission_loop(
// that inspect the rollout file do not race with the background writer.
let recorder_opt = sess.rollout.lock_unchecked().take();
let shutdown_error: Option<String> = match recorder_opt {
Some(recorder) => {
match recorder.shutdown().await {
Ok(()) => {
if delete_rollout && let Err(e) = recorder.delete_rollout_file().await {
warn!("failed to delete rollout file: {e}");
Some(format!("Failed to delete rollout file: {e}"))
} else {
None
}
}
Err(e) => {
warn!("failed to shutdown rollout recorder: {e}");
Some("Failed to shutdown rollout recorder".to_string())
Some(recorder) => match recorder.shutdown().await {
Ok(()) => {
if delete_rollout && let Err(e) = recorder.delete_rollout_file().await {
warn!("failed to delete rollout file: {e}");
Some(format!("Failed to delete rollout file: {e}"))
} else {
None
}
}
}
None => None
Err(e) => {
warn!("failed to shutdown rollout recorder: {e}");
Some("Failed to shutdown rollout recorder".to_string())
}
},
None => None,
};
if let Some(message) = shutdown_error {

5
codex-rs/mcp-server/src/codex_message_processor.rs
View File

@@ -729,9 +729,7 @@ impl CodexMessageProcessor {
{
let error = JSONRPCErrorError {
code: INTERNAL_ERROR_CODE,
message: format!(
"error shutting down conversation {conversation_id}: {err}"
),
message: format!("error shutting down conversation {conversation_id}: {err}"),
data: None,
};
self.outgoing.send_error(request_id, error).await;
@@ -749,7 +747,6 @@ impl CodexMessageProcessor {
self.outgoing
.send_response(request_id, DeleteConversationResponse {})
.await;
}
async fn send_user_message(&self, request_id: RequestId, params: SendUserMessageParams) {