system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-10-14 20:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

pipewire: re-use info dict for the journal logger

Browse source 
All the config options we pass in are standardised in spa/support/log.h, so the
journal logger should be (and it is) able to handle or ignore them.
This commit is contained in:
Peter Hutterer 2021-09-27 13:27:10 +10:00 committed by Wim Taymans
parent ae59185f6f
commit bbe9059ed3
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/pipewire/pipewire.c
View file

@ -472,26 +472,20 @@ const char *pw_ngettext(const char *msgid, const char *msgid_plural, unsigned lo
}
#ifdef HAVE_SYSTEMD
static struct spa_log *load_journal_logger(struct support *support)
static struct spa_log *load_journal_logger(struct support *support,
const struct spa_dict *info)
{
struct spa_handle *handle;
void *iface = NULL;
int res = -ENOENT;
struct spa_dict info;
struct spa_dict_item items[1];
char level[32];
uint32_t i;
/* is the journal even available? */
if (access("/run/systemd/journal/socket", F_OK) != 0)
return NULL;
snprintf(level, sizeof(level), "%d", pw_log_level);
items[0] = SPA_DICT_ITEM_INIT(SPA_KEY_LOG_LEVEL, level);
info = SPA_DICT_INIT(items, 1);
handle = load_spa_handle("support/libspa-journal",
SPA_NAME_SUPPORT_LOG, &info,
SPA_NAME_SUPPORT_LOG, info,
support->n_support, support->support);
if (handle == NULL)
return NULL;
@ -586,7 +580,7 @@ void pw_init(int *argc, char **argv[])
#ifdef HAVE_SYSTEMD
if ((str = getenv("PIPEWIRE_LOG_SYSTEMD")) == NULL || spa_atob(str)) {
log = load_journal_logger(support);
log = load_journal_logger(support, &info);
if (log)
pw_log_set(log);
}