Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-28 05:35:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: add service integration for macos, observability

Browse Source 
Adds support for running the tunnel as a service on macOS via launchservices.

It also hooks up observability (`code tunnel service log`) on macOS and Linux.
On macOS--and later Windows, hence the manual implementation of `tail`--it
saves output to a log file and watches it. On Linux, it simply delegates to
journalctl.

The "tailing" is implemented via simple polling of the file size. I didn't want
to pull in a giant set of dependencies for inotify/kqueue/etc just for this use
case; performance when polling a single log file is not a huge concern.
This commit is contained in:
Connor Peet
2022-11-15 15:17:48 -08:00
parent 2ab5e3f458
commit 1bf3323015
12 changed files with 606 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cli/src/bin/code/main.rs
View File

@@ -9,6 +9,7 @@ use std::process::Command;
use clap::Parser;
use cli::{
commands::{args, tunnels, update, version, CommandContext},
constants::get_default_user_agent,
desktop, log as own_log,
state::LauncherPaths,
util::{
@@ -38,16 +39,12 @@ async fn main() -> Result<(), std::convert::Infallible> {
let core = parsed.core();
let context = CommandContext {
http: reqwest::Client::new(),
http: reqwest::ClientBuilder::new()
.user_agent(get_default_user_agent())
.build()
.unwrap(),
paths: LauncherPaths::new(&core.global_options.cli_data_dir).unwrap(),
log: own_log::Logger::new(
SdkTracerProvider::builder().build().tracer("codecli"),
if core.global_options.verbose {
own_log::Level::Trace
} else {
core.global_options.log.unwrap_or(own_log::Level::Info)
},
),
log: make_logger(core),
args: core.clone(),
};
@@ -111,6 +108,23 @@ async fn main() -> Result<(), std::convert::Infallible> {
}
}
fn make_logger(core: &args::CliCore) -> own_log::Logger {
let log_level = if core.global_options.verbose {
own_log::Level::Trace
} else {
core.global_options.log.unwrap_or(own_log::Level::Info)
};
let tracer = SdkTracerProvider::builder().build().tracer("codecli");
let mut log = own_log::Logger::new(tracer, log_level);
if let Some(f) = &core.global_options.log_to_file {
log =
log.tee(own_log::FileLogSink::new(log_level, f).expect("expected to make file logger"))
}
log
}
fn print_and_exit<E>(err: E) -> !
where
E: std::fmt::Display,
@@ -143,7 +157,12 @@ async fn start_code(context: CommandContext, args: Vec<String>) -> Result<i32, A
.args(args)
.status()
.map(|s| s.code().unwrap_or(1))
.map_err(|e| wrap(e, format!("error running VS Code from {}", binary.display())))?;
.map_err(|e| {
wrap(
e,
format!("error running VS Code from {}", binary.display()),
)
})?;
Ok(code)
}