Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
5d229841
Commit
5d229841
authored
Apr 30, 2014
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PVE::REST - always add method info to result
This is usefule for result formaters.
parent
2c72404e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
REST.pm
PVE/REST.pm
+5
-5
No files found.
PVE/REST.pm
View file @
5d229841
...
...
@@ -172,11 +172,11 @@ sub prepare_response_data {
}
my
$exc_to_res
=
sub
{
my
(
$err
,
$status
)
=
@_
;
my
(
$
info
,
$
err
,
$status
)
=
@_
;
$status
=
$status
||
HTTP_INTERNAL_SERVER_ERROR
;
my
$resp
=
{};
my
$resp
=
{
info
=>
$info
};
if
(
ref
(
$err
)
eq
"
PVE::Exception
")
{
$resp
->
{
status
}
=
$err
->
{
code
}
||
$status
;
$resp
->
{
errors
}
=
$err
->
{
errors
}
if
$err
->
{
errors
};
...
...
@@ -269,7 +269,7 @@ sub rest_handler {
# check access permissions
eval
{
$rpcenv
->
check_api2_permissions
(
$info
->
{
permissions
},
$auth
->
{
userid
},
$uri_param
);
};
if
(
my
$err
=
$@
)
{
return
&
$exc_to_res
(
$err
,
HTTP_FORBIDDEN
);
return
&
$exc_to_res
(
$
info
,
$
err
,
HTTP_FORBIDDEN
);
}
if
(
$info
->
{
proxyto
})
{
...
...
@@ -285,7 +285,7 @@ sub rest_handler {
}
};
if
(
my
$err
=
$@
)
{
return
&
$exc_to_res
(
$err
);
return
&
$exc_to_res
(
$
info
,
$
err
);
}
if
(
$remip
)
{
return
{
proxy
=>
$remip
,
proxy_params
=>
$params
};
...
...
@@ -312,7 +312,7 @@ sub rest_handler {
}
};
if
(
my
$err
=
$@
)
{
return
&
$exc_to_res
(
$err
);
return
&
$exc_to_res
(
$
info
,
$
err
);
}
return
$resp
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment