Reduce session logging and background churn
This commit is contained in:
@@ -260,18 +260,19 @@ fn wire_up_terminal_view_session_sharing(
|
||||
if *SessionSettings::as_ref(ctx).honor_ps1 {
|
||||
return
|
||||
}
|
||||
let Some(network) = session_sharer_clone.borrow().clone() else {
|
||||
return;
|
||||
};
|
||||
let prompt_snapshot = current_prompt.read(ctx, |current_prompt, ctx| {
|
||||
PromptSnapshot::from_current_prompt(current_prompt, ctx)
|
||||
});
|
||||
if let Some(network) = session_sharer_clone.borrow().as_ref() {
|
||||
let Ok(serialized_prompt) = serde_json::to_string(&prompt_snapshot) else {
|
||||
log::error!("Failed to serialize prompt snapshot to send active prompt update to shared session server");
|
||||
return
|
||||
};
|
||||
network.update(ctx, |network, _| {
|
||||
network.send_active_prompt_update_if_changed(session_sharing_protocol::common::ActivePrompt::WarpPrompt(serialized_prompt))
|
||||
});
|
||||
}
|
||||
let Ok(serialized_prompt) = serde_json::to_string(&prompt_snapshot) else {
|
||||
log::error!("Failed to serialize prompt snapshot to send active prompt update to shared session server");
|
||||
return
|
||||
};
|
||||
network.update(ctx, |network, _| {
|
||||
network.send_active_prompt_update_if_changed(session_sharing_protocol::common::ActivePrompt::WarpPrompt(serialized_prompt))
|
||||
});
|
||||
});
|
||||
|
||||
let session_sharer_clone = session_sharer.clone();
|
||||
|
||||
@@ -264,11 +264,11 @@ fn add_local_machine_env(env: &mut BTreeMap<OsString, EnvEntry>) {
|
||||
let Ok(value) = reg_value_to_string(&value, &name) else {
|
||||
safe_info!(
|
||||
safe: ("Unable to convert value for key {name:?}"),
|
||||
full: ("Unable to convert value for key {name:?}: {:?}", value.bytes)
|
||||
full: ("Unable to convert value for key {name:?}")
|
||||
);
|
||||
continue;
|
||||
};
|
||||
log::trace!("adding SYS env: {name:?} = {value:?}");
|
||||
log::trace!("adding SYS env: {name:?}");
|
||||
env.insert(
|
||||
map_key(name.clone().into()),
|
||||
EnvEntry {
|
||||
@@ -289,7 +289,7 @@ fn add_user_env(env: &mut BTreeMap<OsString, EnvEntry>) {
|
||||
let Ok(value) = reg_value_to_string(&value, &name) else {
|
||||
safe_info!(
|
||||
safe: ("Unable to convert value for key {name:?}"),
|
||||
full: ("Unable to convert value for key {name:?}: {:?}", value.bytes)
|
||||
full: ("Unable to convert value for key {name:?}")
|
||||
);
|
||||
continue;
|
||||
};
|
||||
@@ -309,7 +309,7 @@ fn add_user_env(env: &mut BTreeMap<OsString, EnvEntry>) {
|
||||
value
|
||||
};
|
||||
|
||||
log::trace!("adding USER env: {name:?} = {value:?}");
|
||||
log::trace!("adding USER env: {name:?}");
|
||||
env.insert(
|
||||
map_key(name.clone().into()),
|
||||
EnvEntry {
|
||||
|
||||
@@ -19,7 +19,10 @@ pub(super) fn parse_ansi_c_quoted_string(quoted_string: String) -> String {
|
||||
if quoted_string.trim().is_empty() {
|
||||
return quoted_string;
|
||||
}
|
||||
log::debug!("Attempting to parse the following ANSI C escaped shell output: {quoted_string}");
|
||||
log::debug!(
|
||||
"Attempting to parse ANSI-C escaped shell output; bytes={}",
|
||||
quoted_string.len()
|
||||
);
|
||||
|
||||
let Some(quoted_string_without_prefix) = quoted_string.strip_prefix("$\'") else {
|
||||
log::warn!("Tried to parse ANSI-C quoted string but $\' prefix was not present");
|
||||
|
||||
@@ -653,10 +653,7 @@ impl<'a, H: Handler + 'a, W: io::Write> Performer<'a, H, W> {
|
||||
fn handle_decoded_data(&mut self, decoded_data: Result<Vec<u8>, hex::FromHexError>) {
|
||||
match decoded_data {
|
||||
Ok(decoded_data) => {
|
||||
safe_debug!(
|
||||
safe: ("Decoded payload"),
|
||||
full: ("Decoded payload string: {:?}", std::str::from_utf8(&decoded_data))
|
||||
);
|
||||
log::debug!("Decoded shell hook payload; bytes={}", decoded_data.len());
|
||||
|
||||
let hook = serde_json::from_slice::<DProtoHook>(&decoded_data);
|
||||
if let Ok(hook) = &hook {
|
||||
@@ -691,10 +688,7 @@ impl<'a, H: Handler + 'a, W: io::Write> Performer<'a, H, W> {
|
||||
return;
|
||||
}
|
||||
};
|
||||
safe_debug!(
|
||||
safe: ("Decoded payload"),
|
||||
full: ("Decoded payload string: {:?}", serde_json::to_string(&hook))
|
||||
);
|
||||
log::debug!("Decoded key-value shell hook payload");
|
||||
self.handle_decoded_hook(Ok(hook));
|
||||
}
|
||||
Some(&WARP_KV_ENTRY_BYTE) => {
|
||||
@@ -888,7 +882,7 @@ where
|
||||
.map(|parts| parts.join(";").trim().to_owned());
|
||||
if let Ok(body) = body {
|
||||
if !body.is_empty() {
|
||||
log::info!("Received OSC 9 notification: {}", body);
|
||||
log::info!("Received OSC 9 notification; bytes={}", body.len());
|
||||
self.handler.pluggable_notification(None, body);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -3058,7 +3058,6 @@ impl BlockList {
|
||||
|
||||
if let Some(prompt_snapshot) = &block.prompt_snapshot {
|
||||
if let Ok(prompt_snapshot) = serde_json::from_str(prompt_snapshot) {
|
||||
log::debug!("Restored prompt: {prompt_snapshot:?}");
|
||||
self.active_block_mut().set_prompt_snapshot(prompt_snapshot);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -356,7 +356,6 @@ impl Sessions {
|
||||
let session = Session::new(session_info.clone(), command_executor);
|
||||
|
||||
log::info!("Shell is bootstrapped with session_id {:?}", session.id());
|
||||
log::debug!("Session details: {session:?}");
|
||||
|
||||
let session = Arc::new(session);
|
||||
self.sessions.insert(session.id(), session.clone());
|
||||
|
||||
Reference in New Issue
Block a user