From 7826d578664bf87b1d975346979327cd514302c9 Mon Sep 17 00:00:00 2001 From: Jan-Michael Brummer Date: Mon, 6 Feb 2023 08:23:14 +0100 Subject: Improve debug output (#43) Add enabling debug output using PX_DEBUG=1 and align debug output messages. --- src/backend/dbus/dbus.c | 4 +++ src/backend/dbus/meson.build | 1 + src/backend/meson.build | 5 ++++ .../plugins/config-sysconfig/config-sysconfig.c | 4 +-- src/backend/plugins/download-curl/download-curl.c | 2 +- src/backend/plugins/download-soup/download-soup.c | 2 +- src/backend/px-manager.c | 32 ++++++++++++++++------ 7 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/backend/dbus/dbus.c b/src/backend/dbus/dbus.c index 4352082..0e5b704 100644 --- a/src/backend/dbus/dbus.c +++ b/src/backend/dbus/dbus.c @@ -61,9 +61,13 @@ handle_method_call (GDBusConnection *connection, result = g_variant_builder_new (G_VARIANT_TYPE ("as")); if (proxies) { + g_debug ("%s: Proxies:", __FUNCTION__); for (idx = 0; proxies[idx]; idx++) { + g_debug ("%s: \t- Proxy[%d] = %s", __FUNCTION__, idx, proxies[idx]); g_variant_builder_add (result, "s", proxies[idx]); } + } else { + g_debug ("%s: No Proxy required", __FUNCTION__); } g_dbus_method_invocation_return_value (invocation, diff --git a/src/backend/dbus/meson.build b/src/backend/dbus/meson.build index 8ab3bfe..866d0b8 100644 --- a/src/backend/dbus/meson.build +++ b/src/backend/dbus/meson.build @@ -48,6 +48,7 @@ if get_option('dbus') executable( 'proxyd', proxyd_sources, + c_args: px_backend_c_args, dependencies: proxyd_deps, install_dir: join_paths(px_prefix, get_option('libexecdir')), install: true, diff --git a/src/backend/meson.build b/src/backend/meson.build index d83a41b..24f3d88 100644 --- a/src/backend/meson.build +++ b/src/backend/meson.build @@ -17,12 +17,17 @@ px_backend_deps = [ peas_dep, ] +px_backend_c_args = [ + '-DG_LOG_DOMAIN="libpxbackend"', +] + px_backend_inc = include_directories('.') px_backend_lib = shared_library( 'pxbackend-@0@'.format(api_version), px_backend_sources, dependencies: px_backend_deps, + c_args: px_backend_c_args, install: true ) diff --git a/src/backend/plugins/config-sysconfig/config-sysconfig.c b/src/backend/plugins/config-sysconfig/config-sysconfig.c index 29e8420..f6bf583 100644 --- a/src/backend/plugins/config-sysconfig/config-sysconfig.c +++ b/src/backend/plugins/config-sysconfig/config-sysconfig.c @@ -62,13 +62,13 @@ px_config_sysconfig_init (PxConfigSysConfig *self) file = g_file_new_for_path (self->proxy_file); if (!file) { - g_print ("Could not create file\n"); + g_debug ("%s: Could not create file", __FUNCTION__); return; } istr = g_file_read (file, NULL, NULL); if (!istr) { - g_print ("Could not read file\n"); + g_debug ("%s: Could not read file", __FUNCTION__); return; } diff --git a/src/backend/plugins/download-curl/download-curl.c b/src/backend/plugins/download-curl/download-curl.c index 9396076..924153f 100644 --- a/src/backend/plugins/download-curl/download-curl.c +++ b/src/backend/plugins/download-curl/download-curl.c @@ -80,7 +80,7 @@ px_download_curl_download (PxDownload *download, res = curl_easy_perform (self->curl); if (res != CURLE_OK) { - g_debug ("Could not download data: %s", curl_easy_strerror (res)); + g_debug ("%s: Could not download data: %s", __FUNCTION__, curl_easy_strerror (res)); return NULL; } diff --git a/src/backend/plugins/download-soup/download-soup.c b/src/backend/plugins/download-soup/download-soup.c index 905f173..b1a7384 100644 --- a/src/backend/plugins/download-soup/download-soup.c +++ b/src/backend/plugins/download-soup/download-soup.c @@ -61,7 +61,7 @@ px_download_soup_download (PxDownload *download, NULL, /* Pass a GCancellable here if you want to cancel a download */ &error); if (!bytes || soup_message_get_status (msg) != SOUP_STATUS_OK) { - g_debug ("Failed to download: %s\n", error ? error->message : ""); + g_debug ("%s: Failed to download: %s", __FUNCTION__, error ? error->message : ""); return NULL; } diff --git a/src/backend/px-manager.c b/src/backend/px-manager.c index 7ef2675..958ffbb 100644 --- a/src/backend/px-manager.c +++ b/src/backend/px-manager.c @@ -72,7 +72,7 @@ px_manager_on_network_changed (GNetworkMonitor *monitor, { PxManager *self = PX_MANAGER (user_data); - g_debug ("%s: Network connection changed, clearing pac data\n", __FUNCTION__); + g_debug ("%s: Network connection changed, clearing pac data", __FUNCTION__); self->wpad = FALSE; g_clear_pointer (&self->pac_url, g_free); @@ -85,6 +85,21 @@ px_manager_constructed (GObject *object) PxManager *self = PX_MANAGER (object); const GList *list; + if (g_getenv ("PX_DEBUG")) { + const gchar *g_messages_debug; + + g_messages_debug = g_getenv ("G_MESSAGES_DEBUG"); + + if (!g_messages_debug) { + g_setenv ("G_MESSAGES_DEBUG", G_LOG_DOMAIN, TRUE); + } else { + g_autofree char *new_g_messages_debug = NULL; + + new_g_messages_debug = g_strconcat (g_messages_debug, " ", G_LOG_DOMAIN, NULL); + g_setenv ("G_MESSAGES_DEBUG", new_g_messages_debug, TRUE); + } + } + self->engine = peas_engine_get_default (); peas_engine_add_search_path (self->engine, self->plugins_dir, NULL); @@ -247,7 +262,7 @@ download_pac (PeasExtensionSet *set, PxDownloadInterface *ifc = PX_DOWNLOAD_GET_IFACE (extension); struct DownloadData *download_data = data; - g_debug ("%s: Download PAC using plugin '%s'\n", __FUNCTION__, peas_plugin_info_get_module_name (info)); + g_debug ("%s: Download PAC using plugin '%s'", __FUNCTION__, peas_plugin_info_get_module_name (info)); if (!download_data->bytes) download_data->bytes = ifc->download (PX_DOWNLOAD (extension), download_data->uri); } @@ -294,7 +309,7 @@ get_config (PeasExtensionSet *set, PxConfigInterface *ifc = PX_CONFIG_GET_IFACE (extension); struct ConfigData *config_data = data; - g_debug ("%s: Asking plugin '%s' for configuration\n", __FUNCTION__, peas_plugin_info_get_module_name (info)); + g_debug ("%s: Asking plugin '%s' for configuration", __FUNCTION__, peas_plugin_info_get_module_name (info)); ifc->get_config (PX_CONFIG (extension), config_data->uri, config_data->builder, config_data->error); } @@ -409,7 +424,7 @@ px_manager_expand_wpad (PxManager *self, if (!self->pac_data) { GUri *wpad_url = g_uri_parse ("http://wpad/wpad.dat", G_URI_FLAGS_PARSE_RELAXED, NULL); - g_debug ("Trying to find the PAC using WPAD...\n"); + g_debug ("%s: Trying to find the PAC using WPAD...", __FUNCTION__); self->pac_url = g_uri_to_string (wpad_url); self->pac_data = px_manager_pac_download (self, self->pac_url); if (!self->pac_data) { @@ -449,9 +464,9 @@ px_manager_expand_pac (PxManager *self, self->pac_data = px_manager_pac_download (self, self->pac_url); if (!self->pac_data) - g_error ("Unable to download PAC!"); + g_warning ("%s: Unable to download PAC from %s!", __FUNCTION__, self->pac_url); else - g_debug ("PAC recevied!\n"); + g_debug ("%s: PAC recevied!", __FUNCTION__); } } @@ -477,6 +492,7 @@ px_manager_get_proxies_sync (PxManager *self, g_autoptr (GUri) uri = g_uri_parse (url, G_URI_FLAGS_PARSE_RELAXED, error); g_auto (GStrv) config = NULL; + g_debug ("%s: url=%s", __FUNCTION__, url ? url : "?"); if (!uri) { g_strv_builder_add (builder, "direct://"); return g_strv_builder_end (builder); @@ -485,11 +501,11 @@ px_manager_get_proxies_sync (PxManager *self, /* TODO: Check topology */ config = px_manager_get_configuration (self, uri, error); - g_debug ("Config is:\n"); + g_debug ("%s: Config is:", __FUNCTION__); for (int idx = 0; idx < g_strv_length (config); idx++) { GUri *conf_url = g_uri_parse (config[idx], G_URI_FLAGS_PARSE_RELAXED, NULL); - g_debug ("\t- %s\n", config[idx]); + g_debug ("%s:\t- Config[%d] = %s\n", __FUNCTION__, idx, config[idx]); if (px_manager_expand_wpad (self, conf_url) || px_manager_expand_pac (self, conf_url)) { struct PacData pac_data = { -- cgit v1.2.1