pidgin/pidgin

Enable structured logging in libpurple

2021-10-18, Elliott Sales de Andrade
1570d8844e9a
Parents a9588f5aef2f
Children 294d7d9c1cd6
Enable structured logging in libpurple

And add log domains where missing.

Testing Done:
Compile only

Reviewed at https://reviews.imfreedom.org/r/1061/
16 files changed, 26 insertions(+), 4 deletions(-)
  • +1 -1
    libpurple/meson.build
  • +1 -0
    libpurple/plugins/keyrings/kwallet/meson.build
  • +3 -0
    libpurple/plugins/keyrings/meson.build
  • +7 -0
    libpurple/plugins/meson.build
  • +1 -0
    libpurple/plugins/notification-sound/meson.build
  • +1 -0
    libpurple/protocols/bonjour/meson.build
  • +1 -0
    libpurple/protocols/facebook/meson.build
  • +1 -0
    libpurple/protocols/gg/meson.build
  • +1 -0
    libpurple/protocols/irc/meson.build
  • +1 -0
    libpurple/protocols/jabber/meson.build
  • +1 -0
    libpurple/protocols/novell/meson.build
  • +1 -0
    libpurple/protocols/null/meson.build
  • +1 -1
    libpurple/protocols/sametime/meson.build
  • +1 -0
    libpurple/protocols/silc/meson.build
  • +1 -1
    libpurple/protocols/zephyr/meson.build
  • +3 -1
    libpurple/tests/meson.build
    • --- a/libpurple/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -294,7 +294,7 @@
    purple_coresources + purple_builtsources +
    purple_builtheaders,
    'purpleprivate.h',
    - c_args : ['-DPURPLE_COMPILATION', '-DG_LOG_DOMAIN="Purple"'],
    + c_args : ['-DPURPLE_COMPILATION', '-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple"'],
    include_directories : [toplevel_inc, libpurple_inc],
    install : true,
    version : PURPLE_LIB_VERSION,
    --- a/libpurple/plugins/keyrings/kwallet/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/plugins/keyrings/kwallet/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -11,6 +11,7 @@
    ]
    kwallet_plugin = library('purplekwallet', kwallet_sources,
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-KWalletKeyring"'],
    dependencies : [kwallet, qt5_dep, libpurple_dep],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/plugins/keyrings/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/plugins/keyrings/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -2,6 +2,7 @@
    if nettle.found()
    internalkeyring_plugin = library('internalkeyring', 'internalkeyring.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-InternalKeyring"'],
    dependencies : [nettle, libpurple_dep],
    name_prefix : '',
    build_by_default : false,
    @@ -10,6 +11,7 @@
    if secretservice.found()
    secretsservice_plugin = library('secretservice', 'secretservice.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-SecretServiceKeyring"'],
    dependencies : [secretservice, libpurple_dep],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    @@ -17,6 +19,7 @@
    if IS_WIN32
    wincred_plugin = library('wincred', 'wincred.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-WinCredKeyring"'],
    dependencies : [libpurple_dep],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/plugins/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/plugins/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -2,36 +2,43 @@
    subdir('notification-sound')
    autoaccept = library('autoaccept', 'autoaccept.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="PurplePlugin-AutoAccept"'],
    dependencies : [libpurple_dep, glib],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    buddynote = library('buddynote', 'buddynote.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="PurplePlugin-BuddyNote"'],
    dependencies : [libpurple_dep],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    idle = library('idle', 'idle.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="PurplePlugin-Idle"'],
    dependencies : [libpurple_dep],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    joinpart = library('joinpart', 'joinpart.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="PurplePlugin-JoinPart"'],
    dependencies : [libpurple_dep],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    psychic = library('psychic', 'psychic.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="PurplePlugin-Psychic"'],
    dependencies : [libpurple_dep],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    statenotify = library('statenotify', 'statenotify.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="PurplePlugin-StateNotify"'],
    dependencies : [libpurple_dep],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    purple_toast = library('purple-toast', 'purple-toast.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="PurplePlugin-Toast"'],
    dependencies : [libpurple_dep],
    name_prefix: '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/plugins/notification-sound/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/plugins/notification-sound/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -2,6 +2,7 @@
    CANBERRA = dependency('libcanberra', version: '>= 0.30')
    library('notification-sound', 'notification-sound.c',
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="PurplePlugin-NotificationSound"'],
    dependencies : [libpurple_dep, glib, CANBERRA],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/bonjour/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/bonjour/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -33,6 +33,7 @@
    BONJOUR_SOURCES += bonjour_resources
    bonjour_prpl = shared_library('bonjour', BONJOUR_SOURCES,
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Bonjour"'],
    link_args : bonjour_link_args,
    dependencies : [libxml, avahi, libpurple_dep, glib, nice, ws2_32],
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/facebook/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/facebook/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -26,6 +26,7 @@
    FACEBOOK_SOURCES += facebook_resources
    facebook_prpl = shared_library('facebook', FACEBOOK_SOURCES,
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Facebook"'],
    dependencies : [json, libpurple_dep, libsoup, glib],
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/gg/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/gg/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -57,6 +57,7 @@
    GG_SOURCES += gg_resources
    gg_prpl = shared_library('gg', GG_SOURCES,
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-GaduGadu"'],
    dependencies : [libgadu, json, libpurple_dep, libsoup, glib],
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/irc/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/irc/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -15,6 +15,7 @@
    IRC_SOURCES += irc_resources
    irc_prpl = shared_library('irc', IRC_SOURCES,
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-IRC"'],
    dependencies : [sasl, libpurple_dep, glib, gio, ws2_32],
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/jabber/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/jabber/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -98,6 +98,7 @@
    JABBER_SOURCES += xmpp_resources
    jabber_prpl = shared_library('jabber', JABBER_SOURCES,
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-XMPP"'],
    link_args : jabber_link_args,
    dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, libsoup, glib, gio, math, nice, ws2_32],
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/novell/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/novell/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -31,6 +31,7 @@
    NOVELL_SOURCES += novell_resources
    novell_prpl = shared_library('novell', NOVELL_SOURCES,
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Novell"'],
    dependencies : [libpurple_dep, glib, ws2_32],
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/null/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/null/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -6,6 +6,7 @@
    # nullprpl isn't built by default; when it is built, it's dynamically linked
    if DYNAMIC_NULL
    null_prpl = shared_library('null', NULL_SOURCES,
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Null"'],
    dependencies : [libpurple_dep, glib],
    install : false, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/sametime/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/sametime/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -13,7 +13,7 @@
    SAMETIME_SOURCES += sametime_resources
    sametime_prpl = shared_library('sametime', SAMETIME_SOURCES,
    - c_args : ['-DG_LOG_DOMAIN="sametime"'],
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Sametime"'],
    dependencies : [meanwhile, gmime, libpurple_dep, glib],
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/silc/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/silc/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -20,6 +20,7 @@
    SILC_SOURCES += silc_resources
    silc_prpl = shared_library('silcpurple', SILC_SOURCES,
    + c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-SILC"'],
    dependencies : [silc, libpurple_dep, glib],
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/protocols/zephyr/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/protocols/zephyr/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -77,7 +77,7 @@
    ZEPHYR_SOURCES += zephyr_resources
    zephyr_prpl = shared_library('zephyr', ZEPHYR_SOURCES,
    - c_args : '-Dlint',
    + c_args : ['-Dlint', '-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Zephyr"'],
    dependencies : [extdep, libpurple_dep, glib],
    install : true, install_dir : PURPLE_PLUGINDIR)
    --- a/libpurple/tests/meson.build Mon Oct 18 01:40:57 2021 -0500
    +++ b/libpurple/tests/meson.build Mon Oct 18 01:47:59 2021 -0500
    @@ -24,7 +24,9 @@
    'test_ui.c',
    'test_ui.h',
    c_args: [
    - '-DTEST_DATA_DIR="@0@/data"'.format(meson.current_source_dir())
    + '-DTEST_DATA_DIR="@0@/data"'.format(meson.current_source_dir()),
    + '-DG_LOG_USE_STRUCTURED',
    + '-DG_LOG_DOMAIN="Purple-TestUI"',
    ],
    dependencies: [libpurple_dep, glib]
    )