Signed-off-by: Stoiko Ivanov <s.iva...@proxmox.com>
---
PVE/APIServer/AnyEvent.pm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/PVE/APIServer/AnyEvent.pm b/PVE/APIServer/AnyEvent.pm
index 0165264..9a4b7e7 100644
--- a/PVE/APIServer/AnyEvent.pm
+++ b/PVE/APIServer/AnyEvent.pm
@@ -153,7 +153,7 @@ sub client_do_disconnect {
return;
}
- print "close connection $hdl\n" if $self->{debug};
+ $self->dprint("close connection $hdl");
&$shutdown_hdl($hdl);
@@ -164,7 +164,7 @@ sub client_do_disconnect {
}
$self->{conn_count}--;
- print "$$: CLOSE FH" . $hdl->{fh}->fileno() . "
CONN$self->{conn_count}\n" if $self->{debug};
+ $self->dprint("CLOSE FH" . $hdl->{fh}->fileno() . "
CONN$self->{conn_count}");
}
sub finish_response {
@@ -427,7 +427,7 @@ sub websocket_proxy {
my ($fh) = @_
or die "connect to '$remhost:$remport' failed: $!";
- print "$$: CONNECTed to '$remhost:$remport'\n" if $self->{debug};
+ $self->dprint("CONNECTed to '$remhost:$remport'");
$reqstate->{proxyhdl} = AnyEvent::Handle->new(
fh => $fh,
@@ -522,7 +522,7 @@ sub websocket_proxy {
$reqstate->{proxyhdl}->push_write($payload) if
$reqstate->{proxyhdl};
} elsif ($opcode == 8) {
my $statuscode = unpack ("n", $payload);
- print "websocket received close. status code:
'$statuscode'\n" if $self->{debug};
+ $self->dprint("websocket received close. status code:
'$statuscode'");
if ($reqstate->{proxyhdl}) {
$reqstate->{proxyhdl}->push_shutdown();
}
@@ -553,7 +553,7 @@ sub websocket_proxy {
"Sec-WebSocket-Protocol: $wsproto\015\012" .
"\015\012";
- print $res if $self->{debug};
+ $self->dprint($res);
$reqstate->{hdl}->push_write($res);
@@ -855,9 +855,9 @@ sub handle_spice_proxy_request {
if ($node ne 'localhost' && PVE::INotify::nodename() !~ m/^$node$/i) {
$remip = $self->remote_node_ip($node);
- print "REMOTE CONNECT $vmid, $remip, $connect_str\n" if
$self->{debug};
+ $self->dprint("REMOTE CONNECT $vmid, $remip, $connect_str");
} else {
- print "$$: CONNECT $vmid, $node, $spiceport\n" if $self->{debug};
+ $self->dprint("CONNECT $vmid, $node, $spiceport");
}
if ($remip && $r->header('PVEDisableProxy')) {
@@ -875,7 +875,7 @@ sub handle_spice_proxy_request {
my ($fh) = @_
or die "connect to '$remhost:$remport' failed: $!";
- print "$$: CONNECTed to '$remhost:$remport'\n" if $self->{debug};
+ $self->dprint("CONNECTed to '$remhost:$remport'");
$reqstate->{proxyhdl} = AnyEvent::Handle->new(
fh => $fh,
rbuf_max => 64*1024,
@@ -1348,7 +1348,7 @@ sub unshift_read_header {
die "upload without content length header not
supported" if !$len;
- print "start upload $path $ct $boundary\n" if
$self->{debug};
+ $self->dprint("start upload $path $ct $boundary");
my $tmpfilename = get_upload_filename();
my $outfh = IO::File->new($tmpfilename,
O_RDWR|O_CREAT|O_EXCL, 0600) ||
@@ -1599,7 +1599,7 @@ sub accept_connections {
}
if (!$self->{trusted_env} &&
!$self->check_host_access($reqstate->{peer_host})) {
- print "$$: ABORT request from $reqstate->{peer_host} - access
denied\n" if $self->{debug};
+ $self->dprint("ABORT request from $reqstate->{peer_host} -
access denied");
$reqstate->{log}->{code} = 403;
$self->log_request($reqstate);
shutdown($clientfh, 1);
@@ -1633,7 +1633,7 @@ sub accept_connections {
($self->{tls_ctx} ? (tls => "accept", tls_ctx =>
$self->{tls_ctx}) : ()));
$hdl_err = 0;
- print "$$: ACCEPT FH" . $clientfh->fileno() . "
CONN$self->{conn_count}\n" if $self->{debug};
+ $self->dprint("ACCEPT FH" . $clientfh->fileno() . "
CONN$self->{conn_count}");
$self->push_request_header($reqstate);
}
--
2.20.1
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
