mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve error messages

Browse source 
Send create_object error messages to the new resource id so that
the client can better know what proxy is failing.
Use resource_remove when create_object fails because the core will
already send a remove_id on failure.
Try to send other errors to the proxy that made the request if
possible.
This commit is contained in:
Wim Taymans 2020-02-25 16:38:13 +01:00
parent b96daabb2f
commit 65d72bb87c
9 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/module-adapter.c
View file

@ -117,14 +117,17 @@ static void node_initialized(void *data)
if (res < 0)
goto error_bind;
if ((bound_resource = pw_impl_client_find_resource(client, nd->new_id)) == NULL)
if ((bound_resource = pw_impl_client_find_resource(client, nd->new_id)) == NULL) {
res = -EIO;
goto error_bind;
}
pw_resource_add_listener(bound_resource, &nd->resource_listener, &resource_events, nd);
return;
error_bind:
pw_resource_error(nd->resource, res, "can't bind adapter node");
pw_resource_errorf_id(nd->resource, nd->new_id, res,
"can't bind adapter node: %s", spa_strerror(res));
return;
}
@ -218,19 +221,19 @@ error_properties:
res = -EINVAL;
pw_log_error("factory %p: usage: " FACTORY_USAGE, d->this);
if (resource)
pw_resource_error(resource, res, "usage: " FACTORY_USAGE);
pw_resource_errorf_id(resource, new_id, res, "usage: " FACTORY_USAGE);
goto error_cleanup;
error_no_mem:
res = -errno;
pw_log_error("can't create node: %m");
if (resource)
pw_resource_errorf(resource, res, "can't create node: %s", spa_strerror(res));
pw_resource_errorf_id(resource, new_id, res, "can't create node: %s", spa_strerror(res));
goto error_cleanup;
error_usage:
res = -EINVAL;
pw_log_error("usage: "ADAPTER_USAGE);
if (resource)
pw_resource_error(resource, res, "usage: "ADAPTER_USAGE);
pw_resource_errorf_id(resource, new_id, res, "usage: "ADAPTER_USAGE);
goto error_cleanup;
error_cleanup:
if (properties)