Merge pull request #2 from alertlogic/scan-format

remove new-lines the otp logger way

Author: Evgeny Bob

src/erllambda_error_handler.erl

@@ -10,6 +10,10 @@
 -author('Anton Zaets <[email protected]>').
 -author('Evgeny Bob <[email protected]>').
 
+-ifdef(TEST).
+-include_lib("eunit/include/eunit.hrl").
+-endif.
+
 -behaviour(gen_event).
 
 %% ------------------------------------------------------------------
@@ -49,14 +53,14 @@ handle_event({EventType, _Gleader,
         when EventType =:= error;
              EventType =:= warning_msg;
              EventType =:= info_msg ->
-    output(io_lib:format(Format, Data)),
+    output(Format, Data),
     {ok, State};
 handle_event({EventType, _Gleader,
              {_Pid, _Type, Report}}, State)
         when EventType =:= error_report;
              EventType =:= warning_report;
              EventType =:= info_report ->
-    output(io_lib:format("~p", [Report])),
+    output("~p", [Report]),
     {ok, State};
 handle_event(_, State) ->
     {ok, State}.
@@ -77,21 +81,61 @@ code_change(_OldVsn, State, _Extra) ->
 %% ------------------------------------------------------------------
 %% Internal Function Definitions
 %% ------------------------------------------------------------------
-output(Str) ->
-    io:fwrite("~s~n", [nonl(Str)]).
-
-%% replace all '\n' with space and consume all the whitespace after '\n'
-nonl(S) ->
-  nonl(S, []).
-
-nonl([], Accu) ->
-  lists:reverse(Accu);
-nonl([$\n|T], Accu) ->
-  nonl(nows(T), [$\  | Accu]);
-nonl([H|T], Accu) ->
-  nonl(T, [H | Accu]).
-
-%% remove all the leading whitespace
-nows([]) -> [];
-nows([$\  | T]) -> nows(T);
-nows(T) -> T.
+output(Format, Data) ->
+    io:fwrite(format(Format, Data)).
+
+format(Format, Data) ->
+    Format1 = io_lib:scan_format(Format, Data),
+    Format2 = reformat(Format1),
+    Text = io_lib:build_text(Format2),
+    one_line_it(Text).
+
+reformat(Format) ->
+    reformat(Format, _Width = 134217721).
+
+reformat([#{control_char := C} = M | T], Width) when C =:= $p; C =:= $P ->
+    [M#{width => Width} | reformat(T, Width)];
+reformat([H | T], Width) ->
+    [H | reformat(T, Width)];
+reformat([], Width) ->
+    [].
+
+one_line_it(Text) ->
+    re:replace(string:trim(Text), "\r?\n\s*", " ", [{return,list},global,unicode]).
+
+
+%%====================================================================
+%% Test Functions
+%%====================================================================
+-ifdef(TEST).
+
+format_test_() ->
+    MultilineJson =
+        <<"[\n"
+          "  {\n"
+          "    \"_id\": \"5be7f5f8e8c1ed9241898c1a\",\n"
+          "    \"index\": 0,\n"
+          "    \"guid\": \"581599e9-4f5d-45c7-9c5c-2bd5611f59fd\",\n"
+          "    \"isActive\": false,\n"
+          "    \"balance\": \"$3,819.73\",\n"
+          "    \"picture\": \"http://placehold.it/32x32\",\n"
+          "    \"age\": 21,\n"
+          "    \"eyeColor\": \"blue\",\n"
+          "    \"name\": {\n"
+          "      \"first\": \"Marcie\",\n"
+          "      \"last\": \"Byrd\"\n"
+          "    }\n"
+          "  }\n"
+          "]\n">>,
+    [
+     ?_assertEqual("List [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,"
+                   "21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,"
+                   "41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,"
+                   "61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,"
+                   "81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100]",
+                   format("List ~p", [lists:seq(1, 100)])),
+     ?_assertEqual("Multiline Json [ { \"_id\": \"5be7f5f8e8c1ed9241898c1a\", \"index\": 0, \"guid\": \"581599e9-4f5d-45c7-9c5c-2bd5611f59fd\", \"isActive\": false, \"balance\": \"$3,819.73\", \"picture\": \"http://placehold.it/32x32\", \"age\": 21, \"eyeColor\": \"blue\", \"name\": { \"first\": \"Marcie\", \"last\": \"Byrd\" } } ]",
+                   format("Multiline Json ~s", [MultilineJson]))
+    ].
+
+-endif.