File tree Expand file tree Collapse file tree 2 files changed +24
-14
lines changed
packages/edge/infra/client/container-runner Expand file tree Collapse file tree 2 files changed +24
-14
lines changed Original file line number Diff line number Diff line change @@ -84,20 +84,22 @@ pub fn run(
84
84
//
85
85
// This will wait for the child to exit and then exit itself so we have time to ship all of the
86
86
// required logs
87
- let mut signals = Signals :: new ( & [ SIGTERM ] ) ?;
88
- thread:: spawn ( move || {
89
- for _ in signals. forever ( ) {
90
- println ! ( "Received SIGTERM, forwarding to runc container {actor_id}" ) ;
91
- let status = Command :: new ( "runc" )
92
- . arg ( "kill" )
93
- . arg ( "--all" )
94
- . arg ( & actor_id)
95
- . arg ( "SIGTERM" )
96
- . status ( ) ;
97
- println ! ( "runc kill status: {:?}" , status) ;
98
- break ;
99
- }
100
- } ) ;
87
+ //let mut signals = Signals::new(&[SIGTERM])?;
88
+ //thread::spawn(move || {
89
+ // for _ in signals.forever() {
90
+ // println!("Received SIGTERM, forwarding to runc container {actor_id}");
91
+ // let status = Command::new("runc")
92
+ // .arg("kill")
93
+ // .arg("--all")
94
+ // .arg(&actor_id)
95
+ // .arg("SIGTERM")
96
+ // .stdout(Stdio::null())
97
+ // .stderr(Stdio::null())
98
+ // .status();
99
+ // println!("runc kill status: {:?}", status);
100
+ // break;
101
+ // }
102
+ //});
101
103
102
104
// Ship stdout & stderr logs
103
105
let stdout_handle = ship_logs ( msg_tx. clone ( ) , log_shipper:: StreamType :: StdOut , runc_stdout) ;
Original file line number Diff line number Diff line change @@ -24,6 +24,8 @@ impl Setup {
24
24
pub fn signal_child ( & self , signal : & str ) {
25
25
let kill = Command :: new ( "kill" )
26
26
. args ( [ "-s" , signal, & self . child . id ( ) . to_string ( ) ] )
27
+ . stdout ( std:: process:: Stdio :: null ( ) )
28
+ . stderr ( std:: process:: Stdio :: null ( ) )
27
29
. status ( )
28
30
. unwrap ( ) ;
29
31
assert ! ( kill. success( ) ) ;
@@ -37,6 +39,8 @@ impl Drop for Setup {
37
39
. arg ( "delete" )
38
40
. arg ( "--force" )
39
41
. arg ( & self . actor_id )
42
+ . stdout ( std:: process:: Stdio :: null ( ) )
43
+ . stderr ( std:: process:: Stdio :: null ( ) )
40
44
. status ( )
41
45
. unwrap ( ) ;
42
46
@@ -64,6 +68,8 @@ pub fn setup(command: &str) -> Setup {
64
68
. arg ( "docker://debian:12.4" )
65
69
. arg ( "oci:oci-image:latest" )
66
70
. current_dir ( actor_dir. path ( ) )
71
+ . stdout ( std:: process:: Stdio :: null ( ) )
72
+ . stderr ( std:: process:: Stdio :: null ( ) )
67
73
. status ( )
68
74
. unwrap ( ) ;
69
75
assert ! ( status. success( ) ) ;
@@ -74,6 +80,8 @@ pub fn setup(command: &str) -> Setup {
74
80
. arg ( "oci-image:latest" )
75
81
. arg ( "fs" )
76
82
. current_dir ( actor_dir. path ( ) )
83
+ . stdout ( std:: process:: Stdio :: null ( ) )
84
+ . stderr ( std:: process:: Stdio :: null ( ) )
77
85
. status ( )
78
86
. unwrap ( ) ;
79
87
assert ! ( status. success( ) ) ;
You can’t perform that action at this time.
0 commit comments