Skip to content

Commit 7e80917

Browse files
committed
Fix deprecation warnings
1 parent ba7d2a1 commit 7e80917

2 files changed

Lines changed: 26 additions & 26 deletions

File tree

lib/crow/worker.ex

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ defmodule Crow.Worker do
1717
def handle_continue(:send_banner, conn) do
1818
{:ok, {ip, port}} = :inet.peername(conn)
1919
{:ok, hostname} = :inet.gethostname()
20-
:ok = :gen_tcp.send(conn, '# munin node at #{hostname}\n')
20+
:ok = :gen_tcp.send(conn, ~c"# munin node at #{hostname}\n")
2121
Logger.debug("accepted connection from #{:inet.ntoa(ip)}:#{port}.")
2222
{:noreply, conn}
2323
end
2424

2525
@doc false
2626
@impl true
2727
def handle_info({:tcp, sock, "cap" <> _rest}, state) do
28-
:ok = :gen_tcp.send(sock, 'cap\n')
28+
:ok = :gen_tcp.send(sock, ~c"cap\n")
2929
{:noreply, state}
3030
end
3131

@@ -35,13 +35,13 @@ defmodule Crow.Worker do
3535
{plugin, options} ->
3636
options
3737
|> plugin.config()
38-
|> Stream.intersperse('\n')
38+
|> Stream.intersperse(~c"\n")
3939
|> Enum.to_list()
4040
|> :lists.concat()
41-
|> :lists.append('\n.\n')
41+
|> :lists.append(~c"\n.\n")
4242

4343
nil ->
44-
'# unknown plugin\n'
44+
~c"# unknown plugin\n"
4545
end
4646

4747
:ok = :gen_tcp.send(sock, response)
@@ -55,13 +55,13 @@ defmodule Crow.Worker do
5555
{plugin, options} ->
5656
options
5757
|> plugin.values()
58-
|> Stream.intersperse('\n')
58+
|> Stream.intersperse(~c"\n")
5959
|> Enum.to_list()
6060
|> :lists.concat()
61-
|> :lists.append('\n.\n')
61+
|> :lists.append(~c"\n.\n")
6262

6363
nil ->
64-
'# unknown plugin\n'
64+
~c"# unknown plugin\n"
6565
end
6666

6767
:ok = :gen_tcp.send(sock, response)
@@ -73,23 +73,23 @@ defmodule Crow.Worker do
7373
plugin_line =
7474
Config.list()
7575
|> Stream.map(fn {plugin, options} -> plugin.name(options) end)
76-
|> Stream.intersperse(' ')
76+
|> Stream.intersperse(~c" ")
7777
|> Enum.to_list()
7878
|> :lists.concat()
79-
|> :lists.append('\n')
79+
|> :lists.append(~c"\n")
8080

8181
:ok = :gen_tcp.send(sock, plugin_line)
8282
{:noreply, state}
8383
end
8484

8585
def handle_info({:tcp, sock, "nodes\n"}, state) do
8686
{:ok, hostname} = :inet.gethostname()
87-
:ok = :gen_tcp.send(sock, '#{hostname}\n.\n')
87+
:ok = :gen_tcp.send(sock, ~c"#{hostname}\n.\n")
8888
{:noreply, state}
8989
end
9090

9191
def handle_info({:tcp, sock, "version\n"}, state) do
92-
:ok = :gen_tcp.send(sock, 'crow node version #{@version}\n')
92+
:ok = :gen_tcp.send(sock, ~c"crow node version #{@version}\n")
9393
{:noreply, state}
9494
end
9595

@@ -104,7 +104,7 @@ defmodule Crow.Worker do
104104
:ok =
105105
:gen_tcp.send(
106106
sock,
107-
'# unknown command. try cap, config, fetch, list, nodes, version, quit\n'
107+
~c"# unknown command. try cap, config, fetch, list, nodes, version, quit\n"
108108
)
109109

110110
{:noreply, state}

test/crow/worker_test.exs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ defmodule Crow.WorkerTest do
22
use ExUnit.Case
33

44
defmodule TestPlugin do
5-
def name(_options), do: 'custom_name'
6-
def config(_options), do: ['graph_title fizz buzz']
7-
def values(_options), do: ['foo.value 3']
5+
def name(_options), do: ~c"custom_name"
6+
def config(_options), do: [~c"graph_title fizz buzz"]
7+
def values(_options), do: [~c"foo.value 3"]
88
end
99

1010
setup_all do
@@ -30,45 +30,45 @@ defmodule Crow.WorkerTest do
3030

3131
describe "cap command" do
3232
test "displays no capabilities", %{socket: socket} do
33-
:ok = :gen_tcp.send(socket, 'cap\n')
33+
:ok = :gen_tcp.send(socket, ~c"cap\n")
3434
assert_receive {:tcp, ^socket, "cap\n"}
3535
end
3636
end
3737

3838
describe "config command" do
3939
test "displays configuration for known plugins", %{socket: socket} do
40-
:ok = :gen_tcp.send(socket, 'config custom_name\n')
40+
:ok = :gen_tcp.send(socket, ~c"config custom_name\n")
4141
assert_receive {:tcp, ^socket, "graph_title fizz buzz\n.\n"}
4242
end
4343

4444
test "displays unknown plugin for unknown plugins", %{socket: socket} do
45-
:ok = :gen_tcp.send(socket, 'config totally_not_a_plugin\n')
45+
:ok = :gen_tcp.send(socket, ~c"config totally_not_a_plugin\n")
4646
assert_receive {:tcp, ^socket, "# unknown plugin\n"}
4747
end
4848
end
4949

5050
describe "fetch command" do
5151
test "displays values for known plugins", %{socket: socket} do
52-
:ok = :gen_tcp.send(socket, 'fetch custom_name\n')
52+
:ok = :gen_tcp.send(socket, ~c"fetch custom_name\n")
5353
assert_receive {:tcp, ^socket, "foo.value 3\n.\n"}
5454
end
5555

5656
test "displays unknown plugin for unknown plugins", %{socket: socket} do
57-
:ok = :gen_tcp.send(socket, 'fetch totally_not_a_plugin\n')
57+
:ok = :gen_tcp.send(socket, ~c"fetch totally_not_a_plugin\n")
5858
assert_receive {:tcp, ^socket, "# unknown plugin\n"}
5959
end
6060
end
6161

6262
describe "list command" do
6363
test "displays the configured test plugin", %{socket: socket} do
64-
:ok = :gen_tcp.send(socket, 'list\n')
64+
:ok = :gen_tcp.send(socket, ~c"list\n")
6565
assert_receive {:tcp, ^socket, "custom_name\n"}
6666
end
6767
end
6868

6969
describe "nodes command" do
7070
test "displays the local node hostname", %{socket: socket} do
71-
:ok = :gen_tcp.send(socket, 'nodes\n')
71+
:ok = :gen_tcp.send(socket, ~c"nodes\n")
7272
{:ok, hostname} = :inet.gethostname()
7373
expected_message = "#{hostname}\n.\n"
7474
assert_receive {:tcp, ^socket, ^expected_message}
@@ -77,22 +77,22 @@ defmodule Crow.WorkerTest do
7777

7878
describe "version command" do
7979
test "displays the current version", %{socket: socket} do
80-
:ok = :gen_tcp.send(socket, 'version\n')
80+
:ok = :gen_tcp.send(socket, ~c"version\n")
8181
expected_message = "crow node version #{Mix.Project.config()[:version]}\n"
8282
assert_receive {:tcp, ^socket, ^expected_message}
8383
end
8484
end
8585

8686
describe "quit command" do
8787
test "closes the connection", %{socket: socket} do
88-
:ok = :gen_tcp.send(socket, 'quit\n')
88+
:ok = :gen_tcp.send(socket, ~c"quit\n")
8989
assert_receive {:tcp_closed, ^socket}
9090
end
9191
end
9292

9393
describe "unknown commands" do
9494
test "display help", %{socket: socket} do
95-
:ok = :gen_tcp.send(socket, 'totally_not_a_command\n')
95+
:ok = :gen_tcp.send(socket, ~c"totally_not_a_command\n")
9696

9797
assert_receive {:tcp, ^socket,
9898
"# unknown command. try cap, config, fetch, list, nodes, version, quit\n"}

0 commit comments

Comments
 (0)