[Asterisk-code-review] logger.c: Automatically add a newline to formats that don't have one (asterisk[16])

George Joseph asteriskteam at digium.com
Thu Dec 17 09:12:36 CST 2020


George Joseph has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/15211 )

Change subject: logger.c: Automatically add a newline to formats that don't have one
......................................................................

logger.c: Automatically add a newline to formats that don't have one

Scope tracing allows you to not specify a format string or
variable, in which case it just prints the indent, file,
function, and line number.  The trace output automatically
adds a newline to the end in this case.  If you also have
debugging turned on for the module, a debug message is
also printed but the standard log functionality which
prints it doesn't add the newline so you have messages
that don't break correctly.

 * format_log_message_ap(), which is the common log
   message formatter for all channels, now adds a
   newline to the end of format strings that don't
   already have a newline.

ASTERISK-29209
Reported by: Alexander Traud

Change-Id: I994a7df27f88df343b7d19f3e81a4b562d9d41da
---
M main/logger.c
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/main/logger.c b/main/logger.c
index 067f9a9..5562bf3 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -1672,6 +1672,11 @@
 		return NULL;
 	}
 
+	/* Automatically add a newline to format strings that don't have one */
+	if (!ast_ends_with(ast_str_buffer(buf), "\n")) {
+		ast_str_append(&buf, 0, "\n");
+	}
+
 	/* Create a new logging message */
 	if (!(logmsg = ast_calloc_with_stringfields(1, struct logmsg, res + 128))) {
 		return NULL;

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/15211
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-Change-Id: I994a7df27f88df343b7d19f3e81a4b562d9d41da
Gerrit-Change-Number: 15211
Gerrit-PatchSet: 3
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20201217/2d85948b/attachment.html>


More information about the asterisk-code-review mailing list