diff --git a/PVE/APIDaemon.pm b/PVE/APIDaemon.pm index 1a5743112..2e92c05d2 100755 --- a/PVE/APIDaemon.pm +++ b/PVE/APIDaemon.pm @@ -34,15 +34,8 @@ my $max_requests = 500; # max requests per worker my $child_terminate = 0; my $child_reload_config = 0; -my $debug_enabled; -sub enable_debug { - $debug_enabled = 1; -} - -sub debug_msg { - return if !$debug_enabled; - syslog('info', @_); -} +sub enable_debug { PVE::REST::enable_debug(); } +sub debug_msg { PVE::REST::debug_msg(@_); } sub worker_finished { my $cpid = shift; diff --git a/PVE/REST.pm b/PVE/REST.pm index ee211e413..347196f61 100644 --- a/PVE/REST.pm +++ b/PVE/REST.pm @@ -28,6 +28,16 @@ my $baseuri = "/api2"; # http://perl.apache.org/docs/2.0/api/Apache2/SubProcess.html +my $debug_enabled; +sub enable_debug { + $debug_enabled = 1; +} + +sub debug_msg { + return if !$debug_enabled; + syslog('info', @_); +} + sub extract_auth_cookie { my ($cookie) = @_; @@ -181,7 +191,7 @@ sub create_http_request { sub proxy_handler { my($r, $clientip, $host, $method, $abs_uri, $ticket, $token, $params) = @_; - syslog('info', "proxy start $method $host:$abs_uri"); + debug_msg("proxy start $method $host:$abs_uri"); my $ua = LWP::UserAgent->new( protocols_allowed => [ 'http', 'https' ], @@ -243,7 +253,7 @@ sub proxy_handler { $r->headers_out()->add('Content-Length' , length($raw)); $r->print($raw); - syslog('info', "proxy end $method $host:$abs_uri ($code)"); + debug_msg("proxy end $method $host:$abs_uri ($code)"); return OK; } @@ -433,7 +443,7 @@ my $known_methods = { sub handler { my($r) = @_; - #syslog('info', "perl handler called"); + debug_msg("perl handler called"); my $method = $r->method; my $clientip = $r->connection->remote_ip(); @@ -492,7 +502,7 @@ sub handler { $r->headers_out()->add('Content-Length', length($raw)); $r->print($raw); - #syslog('info', "perl handler end $res->{status}"); + debug_msg("perl handler end $res->{status}"); return OK; }