Skip to content

Commit 4d66703

Browse files
author
José Valim
committed
Fixes for Erlang 18.0-rc1
1 parent 193e858 commit 4d66703

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lib/ex_unit/lib/ex_unit/runner.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ defmodule ExUnit.Runner do
4747
|> Keyword.put(:exclude, exclude)
4848
|> Keyword.put(:include, include)
4949
|> Keyword.put_new(:max_cases, :erlang.system_info(:schedulers_online))
50-
|> Keyword.put_new(:seed, :erlang.now |> elem(2))
50+
|> Keyword.put_new(:seed, :os.timestamp |> elem(2))
5151
end
5252

5353
defp loop(config) do

lib/logger/lib/logger/translator.ex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ defmodule Logger.Translator do
8282
defp translate_supervisor(min_level,
8383
[supervisor: sup, errorContext: context,
8484
reason: reason,
85-
offender: [{:pid, pid}, {:name, name} | offender]])
86-
when is_pid(pid) and context !== :shutdown do
85+
offender: [{:pid, pid}, {name_or_id, name} | offender]])
86+
when is_pid(pid) and context !== :shutdown and name_or_id in [:name, :id] do
8787
{:ok, ["Child ", inspect(name), " of Supervisor ",
8888
sup_name(sup), ?\s, sup_context(context), ?\n,
8989
"Pid: ", inspect(pid), ?\n,
@@ -95,7 +95,7 @@ defmodule Logger.Translator do
9595
[supervisor: sup, errorContext: context,
9696
reason: reason,
9797
offender: [{:pid, _pid},
98-
{:name, name} | offender]]) do
98+
{name_or_id, name} | offender]]) when name_or_id in [:name, :id] do
9999
{:ok, ["Child ", inspect(name), " of Supervisor ",
100100
sup_name(sup), ?\s, sup_context(context), ?\n,
101101
child_info(min_level, offender), ?\n,
@@ -117,7 +117,7 @@ defmodule Logger.Translator do
117117
[supervisor: sup, errorContext: context,
118118
reason: reason,
119119
offender: [{:nb_children, n},
120-
{:name, name} | offender]]) do
120+
{name_or_id, name} | offender]]) when name_or_id in [:name, :id] do
121121
{:ok, ["Children ", inspect(name), " of Supervisor ",
122122
sup_name(sup), ?\s, sup_context(context), ?\n,
123123
"Number: ", inspect(n), ?\n,
@@ -134,7 +134,7 @@ defmodule Logger.Translator do
134134

135135
defp translate_progress(min_level,
136136
[supervisor: sup,
137-
started: [{:pid, pid}, {:name, name} | started]]) do
137+
started: [{:pid, pid}, {name_or_id, name} | started]]) when name_or_id in [:name, :id] do
138138
{:ok, ["Child ", inspect(name), " of Supervisor ",
139139
sup_name(sup), " started\n",
140140
"Pid: ", inspect(pid), ?\n |

0 commit comments

Comments
 (0)