diff options
author | kballou <kballou@devnulllabs.io> | 2017-11-24 09:39:16 -0700 |
---|---|---|
committer | kballou <kballou@devnulllabs.io> | 2017-11-24 09:54:20 -0700 |
commit | cc67e8e9c1de34bcb2f1f2b84d96aca253b2ae08 (patch) | |
tree | d7b6aa561d9b8d8e3c5e061586e43022d3259306 | |
parent | aef21fff8e18e33da0b08e274c0c7d216bc10241 (diff) | |
download | octonetcat-cc67e8e9c1de34bcb2f1f2b84d96aca253b2ae08.tar.gz octonetcat-cc67e8e9c1de34bcb2f1f2b84d96aca253b2ae08.tar.xz |
Add echo server0.2.0
Modify `acceptor` to pass over the connection to a task echo server.
-rw-r--r-- | lib/octonetcat/accepter.ex | 9 | ||||
-rw-r--r-- | lib/octonetcat/servers/echo.ex | 25 | ||||
-rw-r--r-- | lib/octonetcat/supervisor.ex | 1 | ||||
-rw-r--r-- | mix.exs | 2 |
4 files changed, 34 insertions, 3 deletions
diff --git a/lib/octonetcat/accepter.ex b/lib/octonetcat/accepter.ex index c76d0af..a398676 100644 --- a/lib/octonetcat/accepter.ex +++ b/lib/octonetcat/accepter.ex @@ -17,8 +17,13 @@ defmodule Octonetcat.Accepter do defp loop_accepter(socket) do {:ok, client} = :gen_tcp.accept(socket) Logger.info("Accepted connection") - Logger.info("Closing connection") - :gen_tcp.close(client) + Logger.info("Passing to Echo Server") + {:ok, pid} = Task.Supervisor.start_child( + Octonetcat.TaskSupervisor, + Octonetcat.Echo, + :serve, + [client]) + :ok = :gen_tcp.controlling_process(client, pid) loop_accepter(socket) end diff --git a/lib/octonetcat/servers/echo.ex b/lib/octonetcat/servers/echo.ex new file mode 100644 index 0000000..0d7487f --- /dev/null +++ b/lib/octonetcat/servers/echo.ex @@ -0,0 +1,25 @@ +defmodule Octonetcat.Echo do + @moduledoc """ + Echo TCP Socket Server + + Started under a task supervisor, lives for the life of the socket, + dies on failure or disconnect. + """ + + def serve(socket) do + socket + |> read_line!() + |> write_line!(socket) + + serve(socket) + end + + def read_line!(socket) do + {:ok, line} = :gen_tcp.recv(socket, 0) + line + end + + def write_line!(line, socket) do + :gen_tcp.send(socket, line) + end + end diff --git a/lib/octonetcat/supervisor.ex b/lib/octonetcat/supervisor.ex index 01029cd..50a5f66 100644 --- a/lib/octonetcat/supervisor.ex +++ b/lib/octonetcat/supervisor.ex @@ -11,6 +11,7 @@ defmodule Octonetcat.Supervisor do def init(_) do children = [ + supervisor(Task.Supervisor, [[name: Octonetcat.TaskSupervisor]]), worker(Task, [Octonetcat.Accepter, :accept, []]) ] @@ -6,7 +6,7 @@ defmodule Octonetcat.Mixfile do app: :octonetcat, description: "Demo Echo Server Application", package: package(), - version: "0.1.0", + version: "0.2.0", elixir: "~> 1.5", start_permanent: Mix.env == :prod, docs: docs(), |