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

pulse-server: module-zeroconf-publish: harmonize log messages

Browse source 
Use lowercase letters consistently and report errors.
This commit is contained in:
Barnabás Pőcze 2021-12-28 21:47:20 +01:00
parent 7fb27098b9
commit 6d64454300
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
View file

@ -135,15 +135,13 @@ static void get_service_name(struct pw_manager_object *o, char *buf, size_t leng
static void service_free(struct service *s) static void service_free(struct service *s)
{ {
if (s->entry_group) { pw_log_debug("service %p: free", s);
pw_log_debug("Removing entry group for %s.", s->service_name);
avahi_entry_group_free(s->entry_group);
}
if (s->name) { if (s->entry_group)
pw_log_debug("Removing service for node: %s", s->name); avahi_entry_group_free(s->entry_group);
if (s->name)
free(s->name); free(s->name);
}
pw_properties_free(s->props); pw_properties_free(s->props);
avahi_string_list_free(s->txt); avahi_string_list_free(s->txt);
@ -271,6 +269,8 @@ static struct service *create_service(struct module_zeroconf_publish_data *d, st
fill_service_data(d, s, o); fill_service_data(d, s, o);
pw_log_debug("service %p: created for object %p", s, o);
return s; return s;
} }
@ -319,14 +319,14 @@ static void service_entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupStat
switch (state) { switch (state) {
case AVAHI_ENTRY_GROUP_ESTABLISHED: case AVAHI_ENTRY_GROUP_ESTABLISHED:
pw_log_info("Successfully established service %s.", s->service_name); pw_log_info("established service: %s", s->service_name);
break; break;
case AVAHI_ENTRY_GROUP_COLLISION: case AVAHI_ENTRY_GROUP_COLLISION:
{ {
char *t; char *t;
t = avahi_alternative_service_name(s->service_name); t = avahi_alternative_service_name(s->service_name);
pw_log_info("Name collision, renaming %s to %s.", s->service_name, t); pw_log_info("service name collision: renaming '%s' to '%s'", s->service_name, t);
snprintf(s->service_name, sizeof(s->service_name), "%s", t); snprintf(s->service_name, sizeof(s->service_name), "%s", t);
avahi_free(t); avahi_free(t);
@ -335,9 +335,9 @@ static void service_entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupStat
break; break;
} }
case AVAHI_ENTRY_GROUP_FAILURE: case AVAHI_ENTRY_GROUP_FAILURE:
pw_log_error("Failed to register service: %s", pw_log_error("failed to establish service '%s': %s",
avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g)))); s->service_name,
avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
unpublish_service(s); unpublish_service(s);
clear_entry_group(s); clear_entry_group(s);
break; break;
@ -464,7 +464,7 @@ static void publish_service(struct service *s)
spa_list_remove(&s->link); spa_list_remove(&s->link);
spa_list_append(&s->userdata->published, &s->link); spa_list_append(&s->userdata->published, &s->link);
pw_log_info("Successfully created entry group for %s.", s->service_name); pw_log_info("created service: %s", s->service_name);
} }
static void publish_pending(struct module_zeroconf_publish_data *data) static void publish_pending(struct module_zeroconf_publish_data *data)
@ -498,7 +498,7 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void *d)
publish_pending(data); publish_pending(data);
break; break;
case AVAHI_CLIENT_S_COLLISION: case AVAHI_CLIENT_S_COLLISION:
pw_log_error("Host name collision"); pw_log_error("host name collision");
unpublish_all_services(d); unpublish_all_services(d);
break; break;
case AVAHI_CLIENT_FAILURE: case AVAHI_CLIENT_FAILURE:
@ -515,7 +515,7 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void *d)
if (err == AVAHI_ERR_DISCONNECTED) { if (err == AVAHI_ERR_DISCONNECTED) {
data->client = avahi_client_new(data->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, data, &err); data->client = avahi_client_new(data->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, data, &err);
if (data->client == NULL) if (data->client == NULL)
pw_log_error("avahi_client_new(): %s", avahi_strerror(err)); pw_log_error("failed to create avahi client: %s", avahi_strerror(err));
} }
if (data->client == NULL) if (data->client == NULL)
@ -572,7 +572,7 @@ static int module_zeroconf_publish_load(struct client *client, struct module *mo
data->core = pw_context_connect(module->impl->context, data->core = pw_context_connect(module->impl->context,
pw_properties_copy(client->props), 0); pw_properties_copy(client->props), 0);
if (data->core == NULL) { if (data->core == NULL) {
pw_log_error("Failed to connect to pipewire context"); pw_log_error("failed to connect to pipewire: %m");
return -errno; return -errno;
} }
@ -586,13 +586,13 @@ static int module_zeroconf_publish_load(struct client *client, struct module *mo
data->client = avahi_client_new(data->avahi_poll, AVAHI_CLIENT_NO_FAIL, data->client = avahi_client_new(data->avahi_poll, AVAHI_CLIENT_NO_FAIL,
client_callback, data, &error); client_callback, data, &error);
if (!data->client) { if (!data->client) {
pw_log_error("avahi_client_new() failed: %s", avahi_strerror(error)); pw_log_error("failed to create avahi client: %s", avahi_strerror(error));
return -errno; return -errno;
} }
data->manager = pw_manager_new(data->core); data->manager = pw_manager_new(data->core);
if (client->manager == NULL) { if (client->manager == NULL) {
pw_log_error("Failed to create pipewire manager"); pw_log_error("failed to create pipewire manager: %m");
return -errno; return -errno;
} }