From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D73426B09C for ; Thu, 10 Dec 2020 15:03:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE1DD16240 for ; Thu, 10 Dec 2020 15:03:12 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 265DB16216 for ; Thu, 10 Dec 2020 15:03:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EA58344FAA for ; Thu, 10 Dec 2020 15:03:10 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Cc: Thomas Lamprecht Date: Thu, 10 Dec 2020 15:02:48 +0100 Message-Id: <20201210140251.6127-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201210140251.6127-1-s.ivanov@proxmox.com> References: <20201210140251.6127-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.078 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH http-server v3 1/4] add debug print helper X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 14:03:12 -0000 and uniformly use it Suggested-by: Thomas Lamprecht Signed-off-by: Stoiko Ivanov --- PVE/APIServer/AnyEvent.pm | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/PVE/APIServer/AnyEvent.pm b/PVE/APIServer/AnyEvent.pm index c55da7f..b8c28ce 100644 --- a/PVE/APIServer/AnyEvent.pm +++ b/PVE/APIServer/AnyEvent.pm @@ -66,6 +66,16 @@ my $split_abs_uri = sub { return wantarray ? ($rel_uri, $format) : $rel_uri; }; +sub dprint { + my ($self, $message) = @_; + + return if !$self->{debug}; + + my ($pkg, $pkgfile, $line, $sub) = caller(1); + $sub =~ s/^(?:.+::)+//; + print "worker[$$]: $pkg +$line: $sub: $message\n"; +} + sub log_request { my ($self, $reqstate) = @_; @@ -143,13 +153,13 @@ sub client_do_disconnect { return; } - print "close connection $hdl\n" if $self->{debug}; + $self->dprint("close connection $hdl"); &$shutdown_hdl($hdl); $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 { @@ -412,7 +422,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, @@ -507,7 +517,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(); } @@ -538,7 +548,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); @@ -840,9 +850,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')) { @@ -860,7 +870,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, @@ -1333,7 +1343,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) || @@ -1571,7 +1581,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); next; @@ -1600,7 +1610,7 @@ sub accept_connections { }, ($self->{tls_ctx} ? (tls => "accept", tls_ctx => $self->{tls_ctx}) : ())); - 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