proxmox-mirrors/pve-client
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-client synced 2025-10-26 03:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc console: limit output buffer size

Browse Source
This commit is contained in:
Dietmar Maurer 2018-06-08 08:48:07 +02:00
parent 1ec5788ca4
commit 032dc44cfe
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/APIClient/Commands/lxc.pm
View File

@ -281,6 +281,8 @@ __PACKAGE__->register_method ({
$winch_received = 0; $winch_received = 0;
}; };
my $max_buffer_len = 256*1024;
my $drain_buffer = sub { my $drain_buffer = sub {
my ($fh, $buffer_ref) = @_; my ($fh, $buffer_ref) = @_;
@ -292,7 +294,8 @@ __PACKAGE__->register_method ({
} }
return $nr if !$nr; return $nr if !$nr;
substr($$buffer_ref, 0, $nr, ''); substr($$buffer_ref, 0, $nr, '');
$write_select->remove($fh) if !length($$buffer_ref); $len = length($$buffer_ref);
$write_select->remove($fh) if !$len;
}; };
while (1) { while (1) {
@ -302,6 +305,7 @@ __PACKAGE__->register_method ({
foreach my $fh (@$writable) { foreach my $fh (@$writable) {
if ($fh == $output_fh) { if ($fh == $output_fh) {
$drain_buffer->(\*STDOUT, \$output_buffer); $drain_buffer->(\*STDOUT, \$output_buffer);
$read_select->add($web_socket) if length($output_buffer) <= $max_buffer_len;
} elsif ($fh == $web_socket) { } elsif ($fh == $web_socket) {
$drain_buffer->($web_socket, \$websock_buffer); $drain_buffer->($web_socket, \$websock_buffer);
} }
@ -319,9 +323,12 @@ __PACKAGE__->register_method ({
return; # EOF return; # EOF
} else { } else {
my ($payload, $req_close) = $parse_web_socket_frame->(\$wsbuf); my ($payload, $req_close) = $parse_web_socket_frame->(\$wsbuf);
if ($payload) { if (defined($payload) && length($payload)) {
$output_buffer .= $payload; $output_buffer .= $payload;
$write_select->add($output_fh); $write_select->add($output_fh);
if (length($output_buffer) > $max_buffer_len) {
$read_select->remove($web_socket);
}
} }
return if $req_close; return if $req_close;
} }