Quellcode durchsuchen

Merge pull request #199 from howleysv/pr-empty-tuple-fix

Fixed empty tuple bug in lager:pr/2
pull/200/head
Andrew Thompson vor 11 Jahren
Ursprung
Commit
bb256c2743
2 geänderte Dateien mit 6 neuen und 4 gelöschten Zeilen
  1. +4
    -2
      src/lager.erl
  2. +2
    -2
      test/pr_nested_record_test.erl

+ 4
- 2
src/lager.erl Datei anzeigen

@ -378,8 +378,10 @@ pr(Record, _) ->
Record.
zip([FieldName|RecordFields], [FieldValue|Record], Module, ToReturn) ->
case is_tuple(FieldValue) andalso is_atom(element(1, FieldValue))
andalso is_record_known(FieldValue, Module) of
case is_tuple(FieldValue) andalso
tuple_size(FieldValue) > 0 andalso
is_atom(element(1, FieldValue)) andalso
is_record_known(FieldValue, Module) of
false ->
zip(RecordFields, Record, Module, [{FieldName, FieldValue}|ToReturn]);
_Else ->

+ 2
- 2
test/pr_nested_record_test.erl Datei anzeigen

@ -12,10 +12,10 @@
nested_record_test() ->
A = #a{field1 = x, field2 = y},
B = #b{field1 = A, field2 = z},
B = #b{field1 = A, field2 = {}},
Pr_B = lager:pr(B, ?MODULE),
?assertEqual({'$lager_record', b,
[{field1, {'$lager_record', a,
[{field1, x},{field2, y}]}},
{field2, z}]},
{field2, {}}]},
Pr_B).

Laden…
Abbrechen
Speichern