mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-04 06:19:44 +00:00
Bugfix/ssl proxy to ssl (#2956)
* fix registry rm command * fix bind with addSsl on ssl proto * fix bind with addSsl on ssl proto * Add pre-release version migrations * fix os build * add mime to package deps * update lockfile * more ssl fixes * add waitFor * improve restart lockup * beta.26 * fix dependency health check logic * handle missing health check * fix port forwards --------- Co-authored-by: Aiden McClelland <me@drbonez.dev>
This commit is contained in:
@@ -1142,23 +1142,6 @@ pub async fn cli_attach(
|
||||
None
|
||||
};
|
||||
|
||||
let (kill, thread_kill) = tokio::sync::oneshot::channel();
|
||||
let (thread_send, recv) = tokio::sync::mpsc::channel(4 * CAP_1_KiB);
|
||||
let stdin_thread: NonDetachingJoinHandle<()> = tokio::task::spawn_blocking(move || {
|
||||
use std::io::Read;
|
||||
let mut stdin = stdin.lock().bytes();
|
||||
|
||||
while thread_kill.is_empty() {
|
||||
if let Some(b) = stdin.next() {
|
||||
thread_send.blocking_send(b).unwrap();
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
})
|
||||
.into();
|
||||
let mut stdin = Some(recv);
|
||||
|
||||
let guid: Guid = from_value(
|
||||
context
|
||||
.call_remote::<RpcContext>(
|
||||
@@ -1178,6 +1161,25 @@ pub async fn cli_attach(
|
||||
)?;
|
||||
let mut ws = context.ws_continuation(guid).await?;
|
||||
|
||||
let (kill, thread_kill) = tokio::sync::oneshot::channel();
|
||||
let (thread_send, recv) = tokio::sync::mpsc::channel(4 * CAP_1_KiB);
|
||||
let stdin_thread: NonDetachingJoinHandle<()> = tokio::task::spawn_blocking(move || {
|
||||
use std::io::Read;
|
||||
let mut stdin = stdin.lock().bytes();
|
||||
|
||||
while thread_kill.is_empty() {
|
||||
if let Some(b) = stdin.next() {
|
||||
if let Err(_) = thread_send.blocking_send(b) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
})
|
||||
.into();
|
||||
let mut stdin = Some(recv);
|
||||
|
||||
let mut current_in = "stdin";
|
||||
let mut current_out = "stdout".to_owned();
|
||||
ws.send(Message::Text(current_in.into()))
|
||||
|
||||
Reference in New Issue
Block a user