Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 06:51:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

cli: add --no-sleep flag, implementation for macos (#171885)

Browse Source 
First part of https://github.com/microsoft/vscode-remote-release/issues/7127
This commit is contained in:
Connor Peet
2023-01-20 15:42:09 -08:00
committed by GitHub
parent 00e8fdec5d
commit 4cf496e905
7 changed files with 123 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/commands/args.rs
View File

@@ -596,6 +596,10 @@ pub struct TunnelServeArgs {
#[clap(long)]
pub random_name: bool,
/// Prevents the machine going to sleep while this command runs.
#[clap(long)]
pub no_sleep: bool,
/// Sets the machine name for port forwarding service
#[clap(long)]
pub name: Option<String>,

36
cli/src/commands/tunnels.rs
View File

@@ -17,8 +17,8 @@ use super::{
CommandContext,
};
use crate::tunnels::dev_tunnels::ActiveTunnel;
use crate::tunnels::shutdown_signal::ShutdownSignal;
use crate::tunnels::{dev_tunnels::ActiveTunnel, SleepInhibitor};
use crate::{
auth::Auth,
log::{self, Logger},
@@ -213,10 +213,22 @@ pub async fn serve(ctx: CommandContext, gateway_args: TunnelServeArgs) -> Result
log, paths, args, ..
} = ctx;
let no_sleep = match gateway_args.no_sleep.then(SleepInhibitor::new) {
Some(Ok(i)) => Some(i),
Some(Err(e)) => {
warning!(log, "Could not inhibit sleep: {}", e);
None
}
None => None,
};
legal::require_consent(&paths, gateway_args.accept_server_license_terms)?;
let csa = (&args).into();
serve_with_csa(paths, log, gateway_args, csa, None).await
let result = serve_with_csa(paths, log, gateway_args, csa, None).await;
drop(no_sleep);
result
}
fn get_connection_token(tunnel: &ActiveTunnel) -> String {
@@ -253,16 +265,16 @@ async fn serve_with_csa(
let shutdown_tx = if let Some(tx) = shutdown_rx {
tx
} else if let Some(pid) = gateway_args
.parent_process_id
.and_then(|p| Pid::from_str(&p).ok())
{
ShutdownSignal::create_rx(&[
ShutdownSignal::CtrlC,
ShutdownSignal::ParentProcessKilled(pid),
])
} else {
ShutdownSignal::create_rx(&[ShutdownSignal::CtrlC])
};
.parent_process_id
.and_then(|p| Pid::from_str(&p).ok())
{
ShutdownSignal::create_rx(&[
ShutdownSignal::CtrlC,
ShutdownSignal::ParentProcessKilled(pid),
])
} else {
ShutdownSignal::create_rx(&[ShutdownSignal::CtrlC])
};
let mut r = crate::tunnels::serve(&log, tunnel, &paths, &csa, platform, shutdown_tx).await?;
r.tunnel.close().await.ok();