<div dir="ltr"><div><div><div>Sorry, I misread the patch.<br><br></div>1. for >2.31 add domain G_MESSAGES_DEBUG if --debug is passed<br></div>2. for <2.31 do not filter debug messages<br><br></div>I agree with 1., but I nack 2. since it was the initial goal of 2bd835fb. However, it should only filter its own debug messages, and for that I proposed another patch "<strong><a name="00058" href="https://www.redhat.com/archives/virt-tools-list/2014-July/msg00058.html">Only filter virt-viewer debug message<em>s"</em></a></strong>
<em></em></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Jul 14, 2014 at 8:08 PM, Marc-André Lureau <span dir="ltr"><<a href="mailto:marcandre.lureau@gmail.com" target="_blank">marcandre.lureau@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div>It's a nice idea, but I have to nack. Imho we shouldn't introduce G_MESSAGES_DEBUG handling for older glib that didn't support it.<br>
</div></div><div class="gmail_extra"><div><div class="h5"><br><br><div class="gmail_quote">
On Fri, Jun 27, 2014 at 6:39 PM, Christophe Fergeau <span dir="ltr"><<a href="mailto:cfergeau@redhat.com" target="_blank">cfergeau@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Commit 2bd835fb introduced a custom log handler to ensure<br>
we never show debug messages by default regardless of glib<br>
version (older glib were showing them by default).<br>
<br>
However this custom log handler does not take into account<br>
G_MESSAGES_DEBUG. This commit adds support for that and<br>
makes the handling of --debug identical between older and newer glibs.<br>
---<br>
<br>
Changes since v1:<br>
- on older glibs, only do the getenv dance once instead of once<br>
per log-message<br>
<br>
src/virt-viewer-app.c | 17 ++++++++++-------<br>
src/virt-viewer-util.c | 8 +++++---<br>
2 files changed, 15 insertions(+), 10 deletions(-)<br>
<br>
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c<br>
index 24ca5c1..a523090 100644<br>
--- a/src/virt-viewer-app.c<br>
+++ b/src/virt-viewer-app.c<br>
@@ -183,19 +183,22 @@ static guint signals[SIGNAL_LAST];<br>
void<br>
virt_viewer_app_set_debug(gboolean debug)<br>
{<br>
-#if GLIB_CHECK_VERSION(2, 31, 0)<br>
- if (debug) {<br>
- const gchar *doms = g_getenv("G_MESSAGES_DEBUG");<br>
- if (!doms) {<br>
+ const gchar *doms = g_getenv("G_MESSAGES_DEBUG");<br>
+ if (!doms) {<br>
+ if (debug)<br>
g_setenv("G_MESSAGES_DEBUG", G_LOG_DOMAIN, 1);<br>
- } else if (!g_str_equal(doms, "all") &&<br>
- !strstr(doms, G_LOG_DOMAIN)) {<br>
+ } else if (!g_str_equal(doms, "all") &&<br>
+ !strstr(doms, G_LOG_DOMAIN)) {<br>
+ if (debug) {<br>
gchar *newdoms = g_strdup_printf("%s %s", doms, G_LOG_DOMAIN);<br>
g_setenv("G_MESSAGES_DEBUG", newdoms, 1);<br>
g_free(newdoms);<br>
}<br>
+ } else {<br>
+ /* G_MESSAGES_DEBUG=all or G_MESSAGES_DEBUG contains G_LOG_DOMAIN */<br>
+ debug = TRUE;<br>
}<br>
-#endif<br>
+<br>
doDebug = debug;<br>
}<br>
<br>
diff --git a/src/virt-viewer-util.c b/src/virt-viewer-util.c<br>
index 6fdaa07..f4bd20a 100644<br>
--- a/src/virt-viewer-util.c<br>
+++ b/src/virt-viewer-util.c<br>
@@ -283,9 +283,11 @@ static void log_handler(const gchar *log_domain,<br>
const gchar *message,<br>
gpointer unused_data)<br>
{<br>
- if (glib_check_version(2, 32, 0) != NULL)<br>
- if (log_level >= G_LOG_LEVEL_DEBUG && !doDebug)<br>
- return;<br>
+#if !GLIB_CHECK_VERSION(2, 31, 0)<br>
+ /* Older glibs were showing G_LOG_LEVEL_{INFO,DEBUG} messages by default */<br>
+ if (log_level >= G_LOG_LEVEL_INFO && !doDebug)<br>
+ return;<br>
+#endif<br>
<br>
g_log_default_handler(log_domain, log_level, message, unused_data);<br>
}<br>
<span><font color="#888888">--<br>
1.9.3<br>
<br>
_______________________________________________<br>
virt-tools-list mailing list<br>
<a href="mailto:virt-tools-list@redhat.com" target="_blank">virt-tools-list@redhat.com</a><br>
<a href="https://www.redhat.com/mailman/listinfo/virt-tools-list" target="_blank">https://www.redhat.com/mailman/listinfo/virt-tools-list</a><br>
</font></span></blockquote></div><br><br clear="all"><br></div></div><span class="HOEnZb"><font color="#888888">-- <br>Marc-André Lureau
</font></span></div>
</blockquote></div><br><br clear="all"><br>-- <br>Marc-André Lureau
</div>