Skip to content

Commit 02dee46

Browse files
author
alexrp
committed
Use System.services_timeout/0 for elixir_code_server calls in the kernel.
1 parent 4b49e72 commit 02dee46

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

lib/elixir/lib/code.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ defmodule Code do
379379
end
380380

381381
defp server_call(args) do
382-
:gen_server.call(:elixir_code_server, args)
382+
:gen_server.call(:elixir_code_server, args, System.services_timeout)
383383
end
384384

385385
defp server_cast(args) do

lib/elixir/lib/kernel/cli.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ defmodule Kernel.CLI do
1212
argv = lc arg inlist argv, do: list_to_binary(arg)
1313

1414
{ config, argv } = process_argv(argv, Kernel.CLI.Config.new)
15-
:gen_server.call(:elixir_code_server, { :argv, argv })
15+
:gen_server.call(:elixir_code_server, { :argv, argv }, System.services_timeout)
1616

1717
run fn ->
1818
Enum.map Enum.reverse(config.commands), process_command(&1, config)
@@ -24,7 +24,7 @@ defmodule Kernel.CLI do
2424
Wait until the CLI finishes procesing options.
2525
"""
2626
def wait_until_finished do
27-
case :gen_server.call(:elixir_code_server, { :wait_until_finished, self }) do
27+
case :gen_server.call(:elixir_code_server, { :wait_until_finished, self }, System.services_timeout) do
2828
:wait ->
2929
receive do
3030
{ :elixir_code_server, :finished } -> :ok
@@ -74,7 +74,7 @@ defmodule Kernel.CLI do
7474
## Private
7575

7676
defp at_exit(status) do
77-
hooks = :gen_server.call(:elixir_code_server, :flush_at_exit)
77+
hooks = :gen_server.call(:elixir_code_server, :flush_at_exit, System.services_timeout)
7878

7979
lc hook inlist hooks do
8080
try do

lib/elixir/lib/system.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ defmodule System do
5050
"""
5151
@spec argv() :: [String.t]
5252
def argv do
53-
:gen_server.call(:elixir_code_server, :argv)
53+
:gen_server.call(:elixir_code_server, :argv, System.services_timeout)
5454
end
5555

5656
@doc """
@@ -315,7 +315,7 @@ defmodule System do
315315
## Helpers
316316

317317
defp server_call(args) do
318-
:gen_server.call(:elixir_code_server, args)
318+
:gen_server.call(:elixir_code_server, args, System.services_timeout)
319319
end
320320

321321
defp filter_stacktrace([{ Kernel, :raise, _, _ }|t]), do: t

0 commit comments

Comments
 (0)