remove base_handler_class - directly use PVE::API2 instead

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>

diff --git a/PVE/HTTPServer.pm b/PVE/HTTPServer.pm
index ab8526b3302fc51287c27e74db2e211298c7e958..299b81676a8de4c1585a509a4d61edb555e8c027 100755 (executable)
--- a/PVE/HTTPServer.pm
+++ b/PVE/HTTPServer.pm
@@ -131,12 +131,8 @@ sub rest_handler {
 
     my $rpcenv = $self->{rpcenv};
 
-    my $base_handler_class = $self->{base_handler_class};
-
-    die "no base handler - internal error" if !$base_handler_class;
-
     my $uri_param = {};
-    my ($handler, $info) = $base_handler_class->find_handler($method, $rel_uri, $uri_param);
+    my ($handler, $info) = PVE::API2->find_handler($method, $rel_uri, $uri_param);
     if (!$handler || !$info) {
        $rpcenv->set_user(undef); # clear after request
        return {

diff --git a/PVE/Service/pvedaemon.pm b/PVE/Service/pvedaemon.pm
index 173a89ce0e1a66343bc839bd355d83e7fb8865ea..486d264ccc0780072ec09e943045747927d85154 100755 (executable)
--- a/PVE/Service/pvedaemon.pm
+++ b/PVE/Service/pvedaemon.pm
@@ -34,7 +34,6 @@ sub init {
     my $socket = $self->create_reusable_socket(85, '127.0.0.1');
 
     $self->{server_config} = {
-       base_handler_class => 'PVE::API2',
        keep_alive => 100,
        max_conn => 500,
        max_requests => 1000,

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index a115dcdc104d5b76c9c00c59a127bec7290cebed..25dae238c1f57456cb24889c1f67325ce6b681da 100755 (executable)
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -75,7 +75,6 @@ sub init {
     add_dirs($dirs, '/novnc/' => '/usr/share/novnc-pve/');
 
     $self->{server_config} = {
-       base_handler_class => 'PVE::API2',
        title => 'Proxmox VE API',
        keep_alive => 100,
        max_conn => 500,

diff --git a/PVE/Service/spiceproxy.pm b/PVE/Service/spiceproxy.pm
index e9f010d18568303317a450626390ada00339eb16..20fd5b24164404dc528319015990cfea2161ef91 100755 (executable)
--- a/PVE/Service/spiceproxy.pm
+++ b/PVE/Service/spiceproxy.pm
@@ -44,7 +44,6 @@ sub init {
     my $socket = $self->create_reusable_socket(3128, undef, $family);
 
     $self->{server_config} = {
-       base_handler_class => 'PVE::API2',
        keep_alive => 0,
        max_conn => 500,
        lockfile => $accept_lock_fn,