Max Brunsfeld created
Release Notes:
- N/ACargo.lock | 3 +
Cargo.toml | 2
crates/proto/proto/zed.proto | 7 +--
crates/proto/src/proto.rs | 2 -
crates/remote/Cargo.toml | 2 +
crates/remote/src/json_log.rs | 59 ++++++++++++++++++++++++++++++++++
crates/remote/src/remote.rs | 1
crates/remote/src/ssh_session.rs | 24 ++++++++++---
crates/remote_server/Cargo.toml | 2 +
crates/remote_server/src/main.rs | 17 ++++++++-
10 files changed, 103 insertions(+), 16 deletions(-)
@@ -8675,6 +8675,8 @@ dependencies = [
"parking_lot",
"prost",
"rpc",
+ "serde",
+ "serde_json",
"smol",
"tempfile",
"util",
@@ -8699,6 +8701,7 @@ dependencies = [
"project",
"remote",
"rpc",
+ "serde",
"serde_json",
"settings",
"smol",
@@ -338,7 +338,7 @@ itertools = "0.11.0"
lazy_static = "1.4.0"
libc = "0.2"
linkify = "0.10.0"
-log = { version = "0.4.16", features = ["kv_unstable_serde"] }
+log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
markup5ever_rcdom = "0.3.0"
nanoid = "0.4"
nix = "0.28"
@@ -268,11 +268,10 @@ message Envelope {
GetSignatureHelpResponse get_signature_help_response = 218;
ListRemoteDirectory list_remote_directory = 219;
ListRemoteDirectoryResponse list_remote_directory_response = 220;
- UpdateDevServerProject update_dev_server_project = 221; // current max
+ UpdateDevServerProject update_dev_server_project = 221;
- // Remote
- AddWorktree add_worktree = 500;
- AddWorktreeResponse add_worktree_response = 501;
+ AddWorktree add_worktree = 222;
+ AddWorktreeResponse add_worktree_response = 223; // current max
}
reserved 158 to 161;
@@ -395,7 +395,6 @@ messages!(
(UpdateContext, Foreground),
(SynchronizeContexts, Foreground),
(SynchronizeContextsResponse, Foreground),
- // Remote development
(AddWorktree, Foreground),
(AddWorktreeResponse, Foreground),
);
@@ -515,7 +514,6 @@ request_messages!(
(RestartLanguageServers, Ack),
(OpenContext, OpenContextResponse),
(SynchronizeContexts, SynchronizeContextsResponse),
- // Remote development
(AddWorktree, AddWorktreeResponse),
);
@@ -27,6 +27,8 @@ log.workspace = true
parking_lot.workspace = true
prost.workspace = true
rpc.workspace = true
+serde.workspace = true
+serde_json.workspace = true
smol.workspace = true
tempfile.workspace = true
util.workspace = true
@@ -0,0 +1,59 @@
+use log::{Level, Log, Record};
+use serde::{Deserialize, Serialize};
+
+#[derive(Deserialize, Debug, Serialize)]
+pub struct LogRecord<'a> {
+ pub level: usize,
+ pub module_path: Option<&'a str>,
+ pub file: Option<&'a str>,
+ pub line: Option<u32>,
+ pub message: String,
+}
+
+impl<'a> LogRecord<'a> {
+ pub fn new(record: &'a Record<'a>) -> Self {
+ Self {
+ level: serialize_level(record.level()),
+ module_path: record.module_path(),
+ file: record.file(),
+ line: record.line(),
+ message: record.args().to_string(),
+ }
+ }
+
+ pub fn log(&'a self, logger: &dyn Log) {
+ if let Some(level) = deserialize_level(self.level) {
+ logger.log(
+ &log::Record::builder()
+ .module_path(self.module_path)
+ .target("remote_server")
+ .args(format_args!("{}", self.message))
+ .file(self.file)
+ .line(self.line)
+ .level(level)
+ .build(),
+ )
+ }
+ }
+}
+
+fn serialize_level(level: Level) -> usize {
+ match level {
+ Level::Error => 1,
+ Level::Warn => 2,
+ Level::Info => 3,
+ Level::Debug => 4,
+ Level::Trace => 5,
+ }
+}
+
+fn deserialize_level(level: usize) -> Option<Level> {
+ match level {
+ 1 => Some(Level::Error),
+ 2 => Some(Level::Warn),
+ 3 => Some(Level::Info),
+ 4 => Some(Level::Debug),
+ 5 => Some(Level::Trace),
+ _ => None,
+ }
+}
@@ -1,3 +1,4 @@
+pub mod json_log;
pub mod protocol;
pub mod ssh_session;
@@ -1,5 +1,8 @@
-use crate::protocol::{
- message_len_from_buffer, read_message_with_len, write_message, MessageId, MESSAGE_LEN_SIZE,
+use crate::{
+ json_log::LogRecord,
+ protocol::{
+ message_len_from_buffer, read_message_with_len, write_message, MessageId, MESSAGE_LEN_SIZE,
+ },
};
use anyhow::{anyhow, Context as _, Result};
use collections::HashMap;
@@ -117,9 +120,14 @@ impl SshSession {
let (outgoing_tx, mut outgoing_rx) = mpsc::unbounded::<Envelope>();
let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
+ run_cmd(client_state.ssh_command(&remote_binary_path).arg("version")).await?;
+
let mut remote_server_child = client_state
- .ssh_command(&remote_binary_path)
- .arg("run")
+ .ssh_command(&format!(
+ "RUST_LOG={} {:?} run",
+ std::env::var("RUST_LOG").unwrap_or(String::new()),
+ remote_binary_path,
+ ))
.spawn()
.context("failed to spawn remote server")?;
let mut child_stderr = remote_server_child.stderr.take().unwrap();
@@ -198,9 +206,13 @@ impl SshSession {
let mut start_ix = 0;
while let Some(ix) = stderr_buffer[start_ix..stderr_offset].iter().position(|b| b == &b'\n') {
let line_ix = start_ix + ix;
- let content = String::from_utf8_lossy(&stderr_buffer[start_ix..line_ix]);
+ let content = &stderr_buffer[start_ix..line_ix];
start_ix = line_ix + 1;
- eprintln!("(remote) {}", content);
+ if let Ok(record) = serde_json::from_slice::<LogRecord>(&content) {
+ record.log(log::logger())
+ } else {
+ eprintln!("(remote) {}", String::from_utf8_lossy(content));
+ }
}
stderr_buffer.drain(0..start_ix);
stderr_offset -= start_ix;
@@ -31,6 +31,8 @@ project.workspace = true
remote.workspace = true
rpc.workspace = true
settings.workspace = true
+serde.workspace = true
+serde_json.workspace = true
smol.workspace = true
util.workspace = true
worktree.workspace = true
@@ -2,15 +2,28 @@ use fs::RealFs;
use futures::channel::mpsc;
use gpui::Context as _;
use remote::{
+ json_log::LogRecord,
protocol::{read_message, write_message},
SshSession,
};
use remote_server::HeadlessProject;
use smol::{io::AsyncWriteExt, stream::StreamExt as _, Async};
-use std::{env, io, mem, process, sync::Arc};
+use std::{
+ env,
+ io::{self, Write},
+ mem, process,
+ sync::Arc,
+};
fn main() {
env::set_var("RUST_BACKTRACE", "1");
+ env_logger::builder()
+ .format(|buf, record| {
+ serde_json::to_writer(&mut *buf, &LogRecord::new(&record))?;
+ buf.write_all(b"\n")?;
+ Ok(())
+ })
+ .init();
let subcommand = std::env::args().nth(1);
match subcommand.as_deref() {
@@ -25,8 +38,6 @@ fn main() {
}
}
- env_logger::init();
-
gpui::App::headless().run(move |cx| {
HeadlessProject::init(cx);