rework formatter registration

[pve-http-server.git] / PVE / APIServer / AnyEvent.pm

diff --git a/PVE/APIServer/AnyEvent.pm b/PVE/APIServer/AnyEvent.pm
index d818e61981756aaf68e6f1a406cf4c2725872742..31380ab6bad83d7ce5226741300f9e7dbe7e33fe 100755 (executable)
--- a/PVE/APIServer/AnyEvent.pm
+++ b/PVE/APIServer/AnyEvent.pm
@@ -657,7 +657,7 @@ sub handle_api2_request {
 
        my ($rel_uri, $format) = &$split_abs_uri($path, $self->{base_uri});
 
-       my $formatter = PVE::APIServer::Formatter::get_formatter($format);
+       my $formatter = PVE::APIServer::Formatter::get_formatter($format, $method, $rel_uri);
 
        if (!defined($formatter)) {
            $self->error($reqstate, HTTP_NOT_IMPLEMENTED, "no such uri $rel_uri, $format");
@@ -738,12 +738,6 @@ sub handle_api2_request {
            $delay = 0 if $delay < 0;
        }
 
-       if ($res->{info} && $res->{info}->{formatter}) {
-           if (defined(my $func = $res->{info}->{formatter}->{$format})) {
-               $formatter = $func;
-           }
-       }
-
        my ($raw, $ct, $nocomp) = &$formatter($res, $res->{data}, $params, $path, $auth);
 
        my $resp;