File 2112-Write-node-info-before-log-message-body-no... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2112-Write-node-info-before-log-message-body-not-after.patch of Package erlang (Revision cfea4cb463bae0c770730e27e14c06dd)

Currently displaying revision cfea4cb463bae0c770730e27e14c06dd , Show latest

From 9755ab551e94ecb2d87c6035fa818768d1c53b82 Mon Sep 17 00:00:00 2001
From: Richard Carlsson <richardc@klarna.com>
Date: Mon, 21 Nov 2016 12:15:06 +0100
Subject: [PATCH 2/2] Write node info before log message body, not after

Make error_logger_tty_h insert node information for nonlocal messages before
the message itself instead of after, both for readability and so as not to
change the line termination property at the end of the message.
---
 lib/stdlib/src/error_logger_file_h.erl   | 2 +-
 lib/stdlib/src/error_logger_tty_h.erl    | 2 +-
 lib/stdlib/test/error_logger_h_SUITE.erl | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/stdlib/src/error_logger_file_h.erl b/lib/stdlib/src/error_logger_file_h.erl
index 51ad61e..0b262de 100644
--- a/lib/stdlib/src/error_logger_file_h.erl
+++ b/lib/stdlib/src/error_logger_file_h.erl
@@ -125,7 +125,7 @@ write_event(#st{fd=Fd}=State, Event) ->
 			 true ->
 			     []
 		     end,
-	    io:put_chars(Fd, [Header,Body,AtNode])
+	    io:put_chars(Fd, [Header,AtNode,Body])
     end.
 
 format_body(State, [{Format,Args}|T]) ->
diff --git a/lib/stdlib/src/error_logger_tty_h.erl b/lib/stdlib/src/error_logger_tty_h.erl
index c320e82..2f2fd65 100644
--- a/lib/stdlib/src/error_logger_tty_h.erl
+++ b/lib/stdlib/src/error_logger_tty_h.erl
@@ -141,7 +141,7 @@ do_write_event(State, {Time, Event}) ->
 			 true ->
 			     []
 		     end,
-	    Str = [Header,Body,AtNode],
+	    Str = [Header,AtNode,Body],
 	    case State#st.io_mod of
 		io_lib ->
 		    Str;
diff --git a/lib/stdlib/test/error_logger_h_SUITE.erl b/lib/stdlib/test/error_logger_h_SUITE.erl
index 2a34c77..30f96e0 100644
--- a/lib/stdlib/test/error_logger_h_SUITE.erl
+++ b/lib/stdlib/test/error_logger_h_SUITE.erl
@@ -297,13 +297,13 @@ match_format(Tag, [Format,Args], [Head|Lines], AtNode, Depth) ->
 	    iolist_to_binary(S)
     end,
     Expected0 = binary:split(Bin, <<"\n">>, [global,trim]),
-    Expected = Expected0 ++ AtNode,
+    Expected = AtNode ++ Expected0,
     match_term_lines(Expected, Lines).
 
 match_term(Tag, [Arg], [Head|Lines], AtNode, Depth) ->
     match_head(Tag, Head),
     Expected0 = match_term_get_expected(Arg, Depth),
-    Expected = Expected0 ++ AtNode,
+    Expected = AtNode ++ Expected0,
     match_term_lines(Expected, Lines).
 
 match_term_get_expected(List, Depth) when is_list(List) ->
-- 
2.10.2

Places

File 2112-Write-node-info-before-log-message-body-not-after.patch of Package erlang (Revision cfea4cb463bae0c770730e27e14c06dd)

Places