From 2d4b6a458bdee8f81d033847cc7859d4c74f1608 Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Wed, 25 Dec 2019 23:09:37 -0600 Subject: [PATCH 1/3] Removed the extra newline being logged Partially fixes #178. An extra newline was being printed when a SoupSession had a logger associated with it. --- libsoup/soup-logger.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libsoup/soup-logger.c b/libsoup/soup-logger.c index 73d8278c..51e20d41 100644 --- a/libsoup/soup-logger.c +++ b/libsoup/soup-logger.c @@ -751,7 +751,6 @@ got_body (SoupMessage *msg, gpointer user_data) g_signal_handlers_disconnect_by_func (msg, finished, logger); print_response (logger, msg); - soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); g_mutex_unlock (&priv->lock); } -- GitLab From 62b79d7cad96c1fed4d1e41c3fbc33712b5ab88e Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Wed, 25 Dec 2019 23:34:02 -0600 Subject: [PATCH 2/3] Restricted logging newlines based on log level Stopped printing newlines when the log level is none during logging. --- libsoup/soup-logger.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libsoup/soup-logger.c b/libsoup/soup-logger.c index 51e20d41..9e851059 100644 --- a/libsoup/soup-logger.c +++ b/libsoup/soup-logger.c @@ -701,7 +701,8 @@ finished (SoupMessage *msg, gpointer user_data) g_mutex_lock (&priv->lock); print_response (logger, msg); - soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); + if (priv->level != SOUP_LOGGER_LOG_NONE) + soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); g_mutex_unlock (&priv->lock); } @@ -716,7 +717,8 @@ got_informational (SoupMessage *msg, gpointer user_data) g_signal_handlers_disconnect_by_func (msg, finished, logger); print_response (logger, msg); - soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); + if (priv->level != SOUP_LOGGER_LOG_NONE) + soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); if (msg->status_code == SOUP_STATUS_CONTINUE && msg->request_body->data) { SoupLoggerLogLevel log_level; @@ -735,7 +737,8 @@ got_informational (SoupMessage *msg, gpointer user_data) "%s", msg->request_body->data); } - soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); + if (priv->level != SOUP_LOGGER_LOG_NONE) + soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); } g_mutex_unlock (&priv->lock); @@ -782,7 +785,8 @@ starting (SoupMessage *msg, gpointer user_data) soup_logger_set_id (logger, socket); print_request (logger, msg, socket, restarted); - soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); + if (priv->level != SOUP_LOGGER_LOG_NONE) + soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); } static void -- GitLab From cab3ef10b683478c983cb94405cead6eea1db408 Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Wed, 25 Dec 2019 23:34:54 -0600 Subject: [PATCH 3/3] Used g_print in favor of the workaround soup_logger_print should only be used to print actual information. --- libsoup/soup-logger.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libsoup/soup-logger.c b/libsoup/soup-logger.c index 9e851059..1b7704c6 100644 --- a/libsoup/soup-logger.c +++ b/libsoup/soup-logger.c @@ -503,7 +503,7 @@ soup_logger_print (SoupLogger *logger, SoupLoggerLogLevel level, priv->printer (logger, level, direction, line, priv->printer_data); } else - printf ("%c %s\n", direction, line); + g_print ("%c %s\n", direction, line); line = end + 1; } while (end && *line); @@ -702,7 +702,7 @@ finished (SoupMessage *msg, gpointer user_data) print_response (logger, msg); if (priv->level != SOUP_LOGGER_LOG_NONE) - soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); + g_print ("\n"); g_mutex_unlock (&priv->lock); } @@ -718,7 +718,7 @@ got_informational (SoupMessage *msg, gpointer user_data) g_signal_handlers_disconnect_by_func (msg, finished, logger); print_response (logger, msg); if (priv->level != SOUP_LOGGER_LOG_NONE) - soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); + g_print ("\n"); if (msg->status_code == SOUP_STATUS_CONTINUE && msg->request_body->data) { SoupLoggerLogLevel log_level; @@ -738,7 +738,7 @@ got_informational (SoupMessage *msg, gpointer user_data) } if (priv->level != SOUP_LOGGER_LOG_NONE) - soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); + g_print ("\n"); } g_mutex_unlock (&priv->lock); @@ -786,7 +786,7 @@ starting (SoupMessage *msg, gpointer user_data) print_request (logger, msg, socket, restarted); if (priv->level != SOUP_LOGGER_LOG_NONE) - soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "\n"); + g_print ("\n"); } static void -- GitLab