aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkballou <kballou@devnulllabs.io>2016-10-30 23:05:23 -0600
committerkballou <kballou@devnulllabs.io>2016-10-30 23:07:59 -0600
commit62b532d0f0236bf91451c7e4bacacc34799caaa6 (patch)
tree96b3f40a46be4ed4bda5eef2aace61ccf52ec0f1
parent35325ce024b36672aca33f08bf61adf3570445bf (diff)
downloadoctochat-62b532d0f0236bf91451c7e4bacacc34799caaa6.tar.gz
octochat-62b532d0f0236bf91451c7e4bacacc34799caaa6.tar.xz
Add echo server and hook into acceptorv0.2.0
-rw-r--r--lib/octochat/acceptor.ex7
-rw-r--r--lib/octochat/servers/echo.ex23
-rw-r--r--lib/octochat/supervisor.ex1
-rw-r--r--mix.exs2
4 files changed, 31 insertions, 2 deletions
diff --git a/lib/octochat/acceptor.ex b/lib/octochat/acceptor.ex
index 66d97fc..5730ee4 100644
--- a/lib/octochat/acceptor.ex
+++ b/lib/octochat/acceptor.ex
@@ -14,7 +14,12 @@ defmodule Octochat.Acceptor do
defp loop_acceptor(socket) do
{:ok, client} = :gen_tcp.accept(socket)
- :gen_tcp.close(client)
+ {:ok, pid} = Task.Supervisor.start_child(
+ Octochat.TaskSupervisor,
+ Octochat.Echo,
+ :serve,
+ [client])
+ :ok = :gen_tcp.controlling_process(client, pid)
loop_acceptor(socket)
end
diff --git a/lib/octochat/servers/echo.ex b/lib/octochat/servers/echo.ex
new file mode 100644
index 0000000..fe25079
--- /dev/null
+++ b/lib/octochat/servers/echo.ex
@@ -0,0 +1,23 @@
+defmodule Octochat.Echo do
+ @moduledoc """
+ Octochat Echo server
+ """
+
+ def serve(socket) do
+ socket
+ |> read_line!()
+ |> write_line!(socket)
+
+ serve(socket)
+ end
+
+ defp read_line!(socket) do
+ {:ok, line} = :gen_tcp.recv(socket, 0)
+ line
+ end
+
+ defp write_line!(line, socket) do
+ :gen_tcp.send(socket, line)
+ end
+
+end
diff --git a/lib/octochat/supervisor.ex b/lib/octochat/supervisor.ex
index 0c38829..d551628 100644
--- a/lib/octochat/supervisor.ex
+++ b/lib/octochat/supervisor.ex
@@ -11,6 +11,7 @@ defmodule Octochat.Supervisor do
def init(_) do
children = [
+ supervisor(Task.Supervisor, [[name: Octochat.TaskSupervisor]]),
worker(Task, [Octochat.Acceptor, :accept, []])
]
diff --git a/mix.exs b/mix.exs
index cb7b454..ff25c44 100644
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule Octochat.Mixfile do
[app: :octochat,
description: "Demo Application for How Swapping Code",
package: package(),
- version: "0.1.0",
+ version: "0.2.0",
elixir: "~> 1.3",
build_embedded: Mix.env == :prod,
start_permanent: Mix.env == :prod,